remove jsNativeCommon sourceSet from MultiplatformConventions plugi…

…n and specify it only in runtime module.
cashapp · Mar 20, 2024 · 672ff65 · 672ff65
1 parent ffb4d17
commit 672ff65
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 20 deletions.
diff --git a/...-convention/src/main/kotlin/app/cash/sqldelight/multiplatform/MultiplatformConventions.kt b/...-convention/src/main/kotlin/app/cash/sqldelight/multiplatform/MultiplatformConventions.kt
@@ -6,6 +6,7 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsTargetDsl
 import org.jetbrains.kotlin.konan.target.HostManager
 
 class MultiplatformConventions : Plugin<Project> {
@@ -21,7 +22,7 @@ class MultiplatformConventions : Plugin<Project> {
 
       jvm()
 
-      js {
+      val jsConfigure: KotlinJsTargetDsl.() -> Unit = {
         browser {
           testTask {
             it.useKarma {
@@ -35,30 +36,13 @@ class MultiplatformConventions : Plugin<Project> {
           }
         }
       }
+      js(jsConfigure)
       @OptIn(ExperimentalWasmDsl::class)
-      wasmJs {
-        browser {
-          testTask {
-            it.useKarma {
-              useChromeHeadless()
-            }
-          }
-        }
-        compilations.configureEach {
-          it.kotlinOptions {
-            moduleKind = "umd"
-          }
-        }
-      }
+      wasmJs(jsConfigure)
 
       @OptIn(ExperimentalKotlinGradlePluginApi::class)
       applyDefaultHierarchyTemplate {
         common {
-          group("jsNativeCommon") {
-            withJs()
-            withWasmJs()
-            withNative()
-          }
           group("jsCommon") {
             withJs()
             withWasmJs()

diff --git a/runtime/build.gradle b/runtime/build.gradle
@@ -16,6 +16,16 @@ apiValidation {
 }
 
 kotlin {
+  applyDefaultHierarchyTemplate {
+    it.common {
+      it.group("jsNativeCommon") {
+        it.withJs()
+        it.withWasmJs()
+        it.withNative()
+      }
+    }
+  }
+
   sourceSets {
     commonTest {
       dependencies {