Refactor Kotlin targets code in build scripts

Author: mahozad

library/build.gradle.kts

@@ -7,8 +7,8 @@ plugins {
     alias(libs.plugins.compose.multiplatform)
     alias(libs.plugins.compose.compiler)
     alias(libs.plugins.android.library)
-    alias(libs.plugins.dokka)
     alias(libs.plugins.maven.publish)
+    alias(libs.plugins.dokka)
 }
 
 group = "ir.mahozad.multiplatform"
@@ -17,27 +17,12 @@ version = "2.1.0-rc"
 kotlin {
     androidTarget { publishLibraryVariants("release") }
     jvm(name = "desktop") // Windows, Linux, macOS (with Java runtime)
-    js(compiler = IR) { // Kotlin/JS drawing to a canvas
-        nodejs()
-        browser()
-        binaries.executable()
-    }
+    js(IR) { browser() }  // Kotlin/JS drawing to a canvas
     @OptIn(ExperimentalWasmDsl::class)
-    wasmJs { // Kotlin/Wasm drawing to a canvas
-        nodejs()
-        browser()
-        binaries.executable()
-    }
-    listOf(
-        iosX64(),
-        iosArm64(),
-        iosSimulatorArm64()
-    ).forEach { iosTarget ->
-        iosTarget.binaries.framework {
-            baseName = "library"
-            isStatic = true
-        }
-    }
+    wasmJs { browser() }  // Kotlin/Wasm drawing to a canvas
+    iosX64()
+    iosArm64()
+    iosSimulatorArm64()
 
     sourceSets {
         commonMain.dependencies {

showcase/desktopApp/build.gradle.kts

@@ -7,11 +7,14 @@ plugins {
 }
 
 kotlin {
-    jvm()
+    jvm(name = "desktop")
     sourceSets {
-        jvmMain.dependencies {
-            implementation(compose.desktop.currentOs)
-            implementation(projects.showcase.shared)
+        @Suppress("unused")
+        val desktopMain by getting {
+            dependencies {
+                implementation(compose.desktop.currentOs)
+                implementation(projects.showcase.shared)
+            }
         }
     }
 }

showcase/desktopApp/src/jvmMain/kotlin/showcase/main.kt renamed to showcase/desktopApp/src/desktopMain/kotlin/showcase/main.kt

@@ -5,11 +5,7 @@ plugins {
 }
 
 kotlin {
-    js(compiler = IR) {
-        browser()
-        nodejs()
-        binaries.executable()
-    }
+    js(IR) { browser() }
     sourceSets {
         jsMain.dependencies {
             implementation(compose.html.core)

showcase/desktopApp/src/jvmMain/resources/logo.svg renamed to showcase/desktopApp/src/desktopMain/resources/logo.svg

@@ -9,19 +9,11 @@ plugins {
 }
 
 kotlin {
+    androidTarget()
     jvm(name = "desktop")
-    js(compiler = IR) {
-        browser()
-        nodejs()
-        binaries.executable()
-    }
+    js(IR) { browser() }
     @OptIn(ExperimentalWasmDsl::class)
-    wasmJs {
-        browser()
-        nodejs()
-        binaries.executable()
-    }
-    androidTarget()
+    wasmJs { browser() }
     // Remember to uncomment kotlin("native.cocoapods") above as well
     // iosX64()
     // iosArm64()
@@ -45,24 +37,19 @@ kotlin {
             implementation(compose.foundation)
             implementation(compose.material)
             implementation(compose.components.resources)
-            // api("ir.mahozad.multiplatform:wavy-slider:x.y.z")
             api(projects.wavySlider)
         }
         androidMain.dependencies {
             api(libs.androidx.activity.compose)
             api(libs.androidx.appcompat)
             api(libs.androidx.core.ktx)
         }
+        @Suppress("unused")
         val desktopMain by getting {
             dependencies {
                 implementation(compose.desktop.common)
             }
         }
-        val jsMain by getting
-        // See above
-        // val iosX64Main by getting
-        // val iosArm64Main by getting
-        // val iosSimulatorArm64Main by getting
     }
 }
 

showcase/jsApp/build.gradle.kts

@@ -8,12 +8,9 @@ plugins {
 
 kotlin {
     @OptIn(ExperimentalWasmDsl::class)
-    wasmJs {
-        browser()
-        nodejs()
-        binaries.executable()
-    }
+    wasmJs { browser() }
     sourceSets {
+        @Suppress("unused")
         val wasmJsMain by getting {
             dependencies {
                 implementation(compose.runtime)