refactor: rename templates and optimize wasmJsMain blocks

2025-09-04 07:39:52 +00:00 · 2025-04-04 20:29:40 +06:00
parent e17868a085
commit 5dff373d5f
46 changed files with 44 additions and 70 deletions
--- a/colors/build.gradle
+++ b/colors/build.gradle
@@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

 kotlin {
    sourceSets {
--- a/colors/common/build.gradle
+++ b/colors/common/build.gradle
@@ -4,4 +4,4 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

 kotlin {
    sourceSets {
@@ -33,7 +33,7 @@ kotlin {
        wasmJsMain {
            dependencies {
                api libs.kotlinx.browser
-                implementation libs.kt.coroutines
+                api libs.kt.coroutines
            }
        }
    }
--- a/common/compose/build.gradle
+++ b/common/compose/build.gradle
@@ -6,7 +6,7 @@ plugins {
    alias(libs.plugins.kt.jb.compose)
 }

-apply from: "$mppComposeJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppComposeJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

 kotlin {
    sourceSets {
--- a/coroutines/build.gradle
+++ b/coroutines/build.gradle
@@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

 kotlin {
    sourceSets {
--- a/coroutines/compose/build.gradle
+++ b/coroutines/compose/build.gradle
@@ -6,7 +6,7 @@ plugins {
    alias(libs.plugins.kt.jb.compose)
 }

-apply from: "$mppComposeJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppComposeJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

 kotlin {
    sourceSets {
--- a/crypto/build.gradle
+++ b/crypto/build.gradle
@@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

 kotlin {
    sourceSets {
--- a/fsm/common/build.gradle
+++ b/fsm/common/build.gradle
@@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

 kotlin {
    sourceSets {
--- a/fsm/repos/common/build.gradle
+++ b/fsm/repos/common/build.gradle
@@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

 kotlin {
    sourceSets {
--- a/gradle/templates/mppComposeJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project.gradle
+++ b/gradle/templates/mppComposeJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project.gradle
--- a/gradle/templates/mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project.gradle
+++ b/gradle/templates/mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project.gradle
--- a/gradle/templates/mppJvmJsWasmJsLinuxMingwProject.gradle
+++ b/gradle/templates/mppJvmJsWasmJsLinuxMingwProject.gradle
--- a/koin/build.gradle
+++ b/koin/build.gradle
@@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

 kotlin {
    sourceSets {
--- a/koin/generator/test/build.gradle
+++ b/koin/generator/test/build.gradle
@@ -5,7 +5,7 @@ plugins {
    id "com.google.devtools.ksp"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"


 kotlin {
--- a/ksp/classcasts/build.gradle
+++ b/ksp/classcasts/build.gradle
@@ -4,4 +4,4 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"
--- a/ksp/classcasts/generator/test/build.gradle
+++ b/ksp/classcasts/generator/test/build.gradle
@@ -7,7 +7,7 @@ plugins {

 ext.do_publish = false

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"


 kotlin {
--- a/ksp/sealed/build.gradle
+++ b/ksp/sealed/build.gradle
@@ -4,4 +4,4 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"
--- a/ksp/sealed/generator/test/build.gradle
+++ b/ksp/sealed/generator/test/build.gradle
@@ -7,7 +7,7 @@ plugins {

 ext.do_publish = false

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"


 kotlin {
--- a/ksp/variations/build.gradle
+++ b/ksp/variations/build.gradle
@@ -4,4 +4,4 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"
--- a/ksp/variations/generator/test/build.gradle
+++ b/ksp/variations/generator/test/build.gradle
@@ -7,7 +7,7 @@ plugins {

 ext.do_publish = false

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"


 kotlin {
--- a/ktor/client/build.gradle
+++ b/ktor/client/build.gradle
@@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

 kotlin {
    sourceSets {
--- a/ktor/common/build.gradle
+++ b/ktor/common/build.gradle
@@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

 kotlin {
    sourceSets {
@@ -16,11 +16,5 @@ kotlin {
                api libs.ktor.io
            }
        }
-
-        wasmJsMain {
-            dependencies {
-
-            }
-        }
    }
 }
--- a/language_codes/build.gradle
+++ b/language_codes/build.gradle
@@ -4,4 +4,4 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"
--- a/matrix/build.gradle
+++ b/matrix/build.gradle
@@ -4,4 +4,4 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"
--- a/mime_types/build.gradle
+++ b/mime_types/build.gradle
@@ -4,4 +4,4 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"
--- a/pagination/common/build.gradle
+++ b/pagination/common/build.gradle
@@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

 kotlin {
    sourceSets {
--- a/pagination/compose/build.gradle
+++ b/pagination/compose/build.gradle
@@ -6,7 +6,7 @@ plugins {
    alias(libs.plugins.kt.jb.compose)
 }

-apply from: "$mppComposeJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppComposeJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

 kotlin {
    sourceSets {
--- a/pagination/ktor/common/build.gradle
+++ b/pagination/ktor/common/build.gradle
@@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

 kotlin {
    sourceSets {
--- a/repos/cache/build.gradle
+++ b/repos/cache/build.gradle
@@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

 kotlin {
    sourceSets {
--- a/repos/common/build.gradle
+++ b/repos/common/build.gradle
@@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

 kotlin {
    sourceSets {
--- a/repos/generator/test/build.gradle
+++ b/repos/generator/test/build.gradle
@@ -5,7 +5,7 @@ plugins {
    id "com.google.devtools.ksp"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"


 kotlin {
--- a/repos/inmemory/build.gradle
+++ b/repos/inmemory/build.gradle
@@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

 kotlin {
    sourceSets {
--- a/repos/ktor/client/build.gradle
+++ b/repos/ktor/client/build.gradle
@@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

 kotlin {
    sourceSets {
--- a/repos/ktor/common/build.gradle
+++ b/repos/ktor/common/build.gradle
@@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

 kotlin {
    sourceSets {
--- a/resources/build.gradle
+++ b/resources/build.gradle
@@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

 kotlin {
    sourceSets {
--- a/safe_wrapper/build.gradle
+++ b/safe_wrapper/build.gradle
@@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

 kotlin {
    sourceSets {
--- a/selector/common/build.gradle
+++ b/selector/common/build.gradle
@@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

 kotlin {
    sourceSets {
--- a/serialization/base64/build.gradle
+++ b/serialization/base64/build.gradle
@@ -4,7 +4,7 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

 kotlin {
    sourceSets {
--- a/serialization/encapsulator/build.gradle
+++ b/serialization/encapsulator/build.gradle
@@ -4,4 +4,4 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"
--- a/serialization/mapper/build.gradle
+++ b/serialization/mapper/build.gradle
@@ -4,4 +4,4 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"
--- a/serialization/typed_serializer/build.gradle
+++ b/serialization/typed_serializer/build.gradle
@@ -4,4 +4,4 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"
--- a/startup/launcher/build.gradle
+++ b/startup/launcher/build.gradle
@@ -4,7 +4,7 @@ plugins {
    id "com.google.devtools.ksp"
 }

-apply from: "$mppJvmJsLinuxMingwProject"
+apply from: "$mppJvmJsWasmJsLinuxMingwProject"

 kotlin {
    jvm {
--- a/startup/plugin/build.gradle
+++ b/startup/plugin/build.gradle
@@ -3,7 +3,7 @@ plugins {
    id "org.jetbrains.kotlin.plugin.serialization"
 }

-apply from: "$mppJvmJsLinuxMingwProject"
+apply from: "$mppJvmJsWasmJsLinuxMingwProject"

 kotlin {
    sourceSets {
@@ -16,25 +16,5 @@ kotlin {
                api libs.uuid
            }
        }
-        jsMain {
-            dependencies {
-                api libs.uuid
-            }
-        }
-        wasmJsMain {
-            dependencies {
-                api libs.uuid
-            }
-        }
-        linuxX64Main {
-            dependencies {
-                api libs.uuid
-            }
-        }
-        mingwX64Main {
-            dependencies {
-                api libs.uuid
-            }
-        }
    }
 }
--- a/startup/template/client/build.gradle
+++ b/startup/template/client/build.gradle
@@ -5,7 +5,7 @@ plugins {
    alias(libs.plugins.compose)
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"

 kotlin {
    sourceSets {
--- a/startup/template/common/build.gradle
+++ b/startup/template/common/build.gradle
@@ -4,4 +4,4 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"
--- a/transactions/build.gradle
+++ b/transactions/build.gradle
@@ -4,4 +4,4 @@ plugins {
    id "com.android.library"
 }

-apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
+apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"