cleanup

cashapp · Apr 22, 2024 · 20267be · 20267be
1 parent f5f6523
commit 20267be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 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,7 +6,6 @@ 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> {
@@ -22,23 +21,21 @@ class MultiplatformConventions : Plugin<Project> {
 
       jvm()
 
-      val jsConfigure: KotlinJsTargetDsl.() -> Unit = {
-        browser {
+      @OptIn(ExperimentalWasmDsl::class)
+      listOf(js(), wasmJs()).forEach {
+        it.browser {
           testTask {
             it.useKarma {
               useChromeHeadless()
             }
           }
         }
-        compilations.configureEach {
+        it.compilations.configureEach {
           it.kotlinOptions {
             moduleKind = "umd"
           }
         }
       }
-      js(jsConfigure)
-      @OptIn(ExperimentalWasmDsl::class)
-      wasmJs(jsConfigure)
 
       @OptIn(ExperimentalKotlinGradlePluginApi::class)
       applyDefaultHierarchyTemplate {

diff --git a/drivers/web-worker-driver/build.gradle b/drivers/web-worker-driver/build.gradle
@@ -5,17 +5,8 @@ plugins {
 }
 
 kotlin {
-  js {
-    browser {
-      testTask {
-        useKarma {
-          useChromeHeadless()
-        }
-      }
-    }
-  }
-  wasmJs {
-    browser {
+  [js(), wasmJs()].forEach {
+    it.browser {
       testTask {
         useKarma {
           useChromeHeadless()