new model of templating

gradle/templates/addCompose.gradle

@@ -0,0 +1,9 @@
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation compose.runtime
+            }
+        }
+    }
+}

gradle/templates/addComposeForAndroid.gradle

@@ -0,0 +1,9 @@
+kotlin {
+    sourceSets {
+        androidUnitTest {
+            dependencies {
+                implementation compose.uiTest
+            }
+        }
+    }
+}

gradle/templates/addComposeForDesktop.gradle

@@ -0,0 +1,15 @@
+kotlin {
+    sourceSets {
+        jvmMain {
+            dependencies {
+                implementation compose.desktop.currentOs
+            }
+        }
+        jvmTest {
+            dependencies {
+                implementation kotlin('test-junit')
+                implementation compose.uiTest
+            }
+        }
+    }
+}

gradle/templates/addComposeForJs.gradle

@@ -0,0 +1,9 @@
+kotlin {
+    sourceSets {
+        jsMain {
+            dependencies {
+                implementation compose.web.core
+            }
+        }
+    }
+}

gradle/templates/defaultProject.gradle

@@ -0,0 +1,24 @@
+project.version = "$version"
+project.group = "$group"
+
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation kotlin('stdlib')
+            }
+        }
+        commonTest {
+            dependencies {
+                implementation kotlin('test-common')
+                implementation kotlin('test-annotations-common')
+                implementation libs.kt.coroutines.test
+            }
+        }
+    }
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}

gradle/templates/defaultProjectWithSerialization.gradle

@@ -0,0 +1,25 @@
+project.version = "$version"
+project.group = "$group"
+
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation kotlin('stdlib')
+                api libs.kt.serialization
+            }
+        }
+        commonTest {
+            dependencies {
+                implementation kotlin('test-common')
+                implementation kotlin('test-annotations-common')
+                implementation libs.kt.coroutines.test
+            }
+        }
+    }
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}

gradle/templates/enableMPPAndroid.gradle

@@ -0,0 +1,31 @@
+kotlin {
+    androidTarget {
+        publishAllLibraryVariants()
+        compilations.all {
+            kotlinOptions {
+                jvmTarget = "17"
+            }
+        }
+    }
+
+    sourceSets {
+        androidUnitTest {
+            dependencies {
+                implementation kotlin('test-junit')
+                implementation libs.android.test.junit
+                implementation libs.android.espresso
+            }
+        }
+        androidInstrumentedTest {
+            dependencies {
+                implementation kotlin('test-junit')
+                implementation libs.android.test.junit
+                implementation libs.android.espresso
+            }
+        }
+
+        androidMain.dependsOn jvmMain
+    }
+}
+
+apply from: "$defaultAndroidSettings"

gradle/templates/enableMPPJs.gradle

@@ -0,0 +1,30 @@
+kotlin {
+    js (IR) {
+        browser {
+            testTask {
+                useMocha {
+                    timeout = "240000"
+                }
+            }
+        }
+        nodejs {
+            testTask {
+                useMocha {
+                    timeout = "240000"
+                }
+            }
+        }
+    }
+
+    sourceSets {
+        jsMain {
+            dependencies {
+            }
+        }
+        jsTest {
+            dependencies {
+                implementation kotlin('test-js')
+            }
+        }
+    }
+}

gradle/templates/enableMPPJvm.gradle

@@ -0,0 +1,21 @@
+kotlin {
+    jvm {
+        compilations.main {
+            kotlinOptions {
+                jvmTarget = "17"
+            }
+        }
+    }
+
+    sourceSets {
+        jvmMain {
+            dependencies {
+            }
+        }
+        jvmTest {
+            dependencies {
+                implementation kotlin('test-junit')
+            }
+        }
+    }
+}

gradle/templates/enableMPPNativeArm64.gradle

@@ -0,0 +1,8 @@
+kotlin {
+    linuxArm64()
+
+    sourceSets {
+        nativeMain.dependsOn commonMain
+        linuxArm64Main.dependsOn nativeMain
+    }
+}

gradle/templates/enableMPPNativeX64.gradle

@@ -0,0 +1,10 @@
+kotlin {
+    linuxX64()
+    mingwX64()
+
+    sourceSets {
+        nativeMain.dependsOn commonMain
+        linuxX64Main.dependsOn nativeMain
+        mingwX64Main.dependsOn nativeMain
+    }
+}

gradle/templates/enableMPPWasmJs.gradle

@@ -0,0 +1,27 @@
+kotlin {
+    wasmJs {
+        browser {
+            testTask {
+                useKarma {
+                    useChromeHeadless()
+                    useConfigDirectory(rootProject.relativeProjectPath("gradle/karma.config.d"))
+                }
+            }
+        }
+        nodejs {
+            testTask {
+                timeout = Duration.ofSeconds(240)
+                nodeJsArgs.add("--unhandled-rejections=warn")
+                nodeJsArgs.add("--trace-warnings")
+            }
+        }
+    }
+
+    sourceSets {
+        wasmJsTest {
+            dependencies {
+                implementation kotlin('test-wasm-js')
+            }
+        }
+    }
+}

gradle/templates/mppAndroidProject.gradle

@@ -1,37 +1,6 @@
-project.version = "$version"
+apply from: "$defaultProject"
-project.group = "$group"
+apply from: "$enableMPPJvm"
-
+apply from: "$enableMPPJs"
+apply from: "$enableMPPWasmJs"
+apply from: "$enableMPPAndroid"
 apply from: "$publish"
-
-kotlin {
-    androidTarget {
-        publishAllLibraryVariants()
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = "17"
-            }
-        }
-    }
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation kotlin('stdlib')
-            }
-        }
-        commonTest {
-            dependencies {
-                implementation kotlin('test-common')
-                implementation kotlin('test-annotations-common')
-                implementation libs.kt.coroutines.test
-            }
-        }
-    }
-}
-
-apply from: "$defaultAndroidSettings"
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}

gradle/templates/mppComposeJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project.gradle

@@ -1,130 +1,12 @@
-project.version = "$version"
+apply from: "$defaultProjectWithSerialization"
-project.group = "$group"
+apply from: "$enableMPPJvm"
-
+apply from: "$enableMPPJs"
+apply from: "$enableMPPWasmJs"
+apply from: "$enableMPPAndroid"
+apply from: "$enableMPPNativeX64"
+apply from: "$enableMPPNativeArm64"
+apply from: "$addCompose"
+apply from: "$addComposeForAndroid"
+apply from: "$addComposeForDesktop"
+apply from: "$addComposeForJs"
 apply from: "$publish"
-
-kotlin {
-    jvm {
-        compilations.main {
-            kotlinOptions {
-                jvmTarget = "17"
-            }
-        }
-    }
-    js (IR) {
-        browser {
-            testTask {
-                useMocha {
-                    timeout = "240000"
-                }
-            }
-        }
-        nodejs {
-            testTask {
-                useMocha {
-                    timeout = "240000"
-                }
-            }
-        }
-    }
-    wasmJs {
-        browser {
-            testTask {
-                useKarma {
-                    useChromeHeadless()
-                    useConfigDirectory(rootProject.relativeProjectPath("gradle/karma.config.d"))
-                }
-            }
-        }
-        nodejs {
-            testTask {
-                timeout = Duration.ofSeconds(240)
-                nodeJsArgs.add("--unhandled-rejections=warn")
-                nodeJsArgs.add("--trace-warnings")
-            }
-        }
-    }
-    androidTarget {
-        publishAllLibraryVariants()
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = "17"
-            }
-        }
-    }
-    linuxX64()
-    mingwX64()
-    linuxArm64()
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation kotlin('stdlib')
-                implementation compose.runtime
-                api libs.kt.serialization
-            }
-        }
-        commonTest {
-            dependencies {
-                implementation kotlin('test-common')
-                implementation kotlin('test-annotations-common')
-                implementation libs.kt.coroutines.test
-            }
-        }
-
-        androidUnitTest {
-            dependencies {
-                implementation kotlin('test-junit')
-                implementation libs.android.test.junit
-                implementation libs.android.espresso
-                implementation compose.uiTest
-            }
-        }
-        androidInstrumentedTest {
-            dependencies {
-                implementation kotlin('test-junit')
-                implementation libs.android.test.junit
-                implementation libs.android.espresso
-            }
-        }
-        jvmMain {
-            dependencies {
-                implementation compose.desktop.currentOs
-            }
-        }
-        jvmTest {
-            dependencies {
-                implementation kotlin('test-junit')
-                implementation compose.uiTest
-            }
-        }
-        jsMain {
-            dependencies {
-                implementation compose.web.core
-            }
-        }
-        jsTest {
-            dependencies {
-                implementation kotlin('test-js')
-            }
-        }
-        wasmJsTest {
-            dependencies {
-                implementation kotlin('test-wasm-js')
-            }
-        }
-        nativeMain.dependsOn commonMain
-        linuxX64Main.dependsOn nativeMain
-        mingwX64Main.dependsOn nativeMain
-        linuxArm64Main.dependsOn nativeMain
-
-        androidMain.dependsOn jvmMain
-    }
-}
-
-apply from: "$defaultAndroidSettings"
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}

gradle/templates/mppJavaProject.gradle

@@ -1,40 +1,3 @@
-project.version = "$version"
+apply from: "$defaultProject"
-project.group = "$group"
+apply from: "$enableMPPJvm"
-
 apply from: "$publish"
-
-kotlin {
-    jvm {
-        compilations.main {
-            kotlinOptions {
-                jvmTarget = "17"
-            }
-        }
-    }
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation kotlin('stdlib')
-            }
-        }
-        commonTest {
-            dependencies {
-                implementation kotlin('test-common')
-                implementation kotlin('test-annotations-common')
-                implementation libs.kt.coroutines.test
-            }
-        }
-
-        jvmTest {
-            dependencies {
-                implementation kotlin('test-junit')
-            }
-        }
-    }
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}

gradle/templates/mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project.gradle

@@ -1,110 +1,8 @@
-project.version = "$version"
+apply from: "$defaultProjectWithSerialization"
-project.group = "$group"
+apply from: "$enableMPPJvm"
-
+apply from: "$enableMPPJs"
+apply from: "$enableMPPWasmJs"
+apply from: "$enableMPPAndroid"
+apply from: "$enableMPPNativeX64"
+apply from: "$enableMPPNativeArm64"
 apply from: "$publish"
-
-kotlin {
-    jvm {
-        compilations.main {
-            kotlinOptions {
-                jvmTarget = "17"
-            }
-        }
-    }
-    js (IR) {
-        browser {
-            testTask {
-                useMocha {
-                    timeout = "240000"
-                }
-            }
-        }
-        nodejs {
-            testTask {
-                useMocha {
-                    timeout = "240000"
-                }
-            }
-        }
-    }
-    wasmJs {
-        browser {
-            testTask {
-                useKarma {
-                    useChromeHeadless()
-                    useConfigDirectory(rootProject.relativeProjectPath("gradle/karma.config.d"))
-                }
-            }
-        }
-        nodejs {
-            testTask {
-                timeout = Duration.ofSeconds(240)
-                nodeJsArgs.add("--unhandled-rejections=warn")
-                nodeJsArgs.add("--trace-warnings")
-            }
-        }
-    }
-    androidTarget {
-        publishAllLibraryVariants()
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = "17"
-            }
-        }
-    }
-    linuxX64()
-    mingwX64()
-    linuxArm64()
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation kotlin('stdlib')
-                api libs.kt.serialization
-            }
-        }
-        commonTest {
-            dependencies {
-                implementation kotlin('test')
-                implementation kotlin('test-annotations-common')
-                implementation libs.kt.coroutines.test
-            }
-        }
-
-        androidUnitTest {
-            dependencies {
-                implementation kotlin('test-junit')
-                implementation libs.android.test.junit
-                implementation libs.android.espresso
-            }
-        }
-        jvmTest {
-            dependencies {
-                implementation kotlin('test-junit')
-            }
-        }
-        jsTest {
-            dependencies {
-                implementation kotlin('test-js')
-            }
-        }
-        wasmJsTest {
-            dependencies {
-                implementation kotlin('test-wasm-js')
-            }
-        }
-        nativeMain.dependsOn commonMain
-        linuxX64Main.dependsOn nativeMain
-        mingwX64Main.dependsOn nativeMain
-        linuxArm64Main.dependsOn nativeMain
-
-        androidMain.dependsOn jvmMain
-    }
-}
-
-apply from: "$defaultAndroidSettings"
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}

gradle/templates/mppJvmJsWasmJsLinuxMingwProject.gradle

@@ -1,92 +1,6 @@
-project.version = "$version"
+apply from: "$defaultProjectWithSerialization"
-project.group = "$group"
+apply from: "$enableMPPJvm"
-
+apply from: "$enableMPPJs"
+apply from: "$enableMPPWasmJs"
+apply from: "$enableMPPNativeX64"
 apply from: "$publish"
-
-kotlin {
-    jvm {
-        compilations.main {
-            kotlinOptions {
-                jvmTarget = "17"
-            }
-        }
-    }
-    js (IR) {
-        browser {
-            testTask {
-                useMocha {
-                    timeout = "240000"
-                }
-            }
-        }
-        nodejs {
-            testTask {
-                useMocha {
-                    timeout = "240000"
-                }
-            }
-        }
-    }
-    wasmJs {
-        browser {
-            testTask {
-                useKarma {
-                    useChromeHeadless()
-                    useConfigDirectory(rootProject.relativeProjectPath("gradle/karma.config.d"))
-                }
-            }
-        }
-        nodejs {
-            testTask {
-                timeout = Duration.ofSeconds(240)
-                nodeJsArgs.add("--unhandled-rejections=warn")
-                nodeJsArgs.add("--trace-warnings")
-            }
-        }
-    }
-    linuxX64()
-    mingwX64()
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation kotlin('stdlib')
-                api libs.kt.serialization
-            }
-        }
-        commonTest {
-            dependencies {
-                implementation kotlin('test-common')
-                implementation kotlin('test-annotations-common')
-                implementation libs.kt.coroutines.test
-            }
-        }
-
-        jvmTest {
-            dependencies {
-                implementation kotlin('test-junit')
-            }
-        }
-        jsTest {
-            dependencies {
-                implementation kotlin('test-js')
-            }
-        }
-        wasmJsTest {
-            dependencies {
-                implementation kotlin('test-wasm-js')
-            }
-        }
-
-        nativeMain.dependsOn commonMain
-        linuxX64Main.dependsOn nativeMain
-        mingwX64Main.dependsOn nativeMain
-
-        androidMain.dependsOn jvmMain
-    }
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}

gradle/templates/mppProjectWithSerializationAndCompose.gradle

@@ -1,120 +1,10 @@
-project.version = "$version"
+apply from: "$defaultProjectWithSerialization"
-project.group = "$group"
+apply from: "$enableMPPJvm"
-
+apply from: "$enableMPPJs"
+apply from: "$enableMPPWasmJs"
+apply from: "$enableMPPAndroid"
+apply from: "$addCompose"
+apply from: "$addComposeForAndroid"
+apply from: "$addComposeForDesktop"
+apply from: "$addComposeForJs"
 apply from: "$publish"
-
-kotlin {
-    jvm {
-        compilations.main {
-            kotlinOptions {
-                jvmTarget = "17"
-            }
-        }
-    }
-    js (IR) {
-        browser {
-            testTask {
-                useMocha {
-                    timeout = "240000"
-                }
-            }
-        }
-        nodejs {
-            testTask {
-                useMocha {
-                    timeout = "240000"
-                }
-            }
-        }
-    }
-    wasmJs {
-        browser {
-            testTask {
-                useKarma {
-                    useChromeHeadless()
-                    useConfigDirectory(rootProject.relativeProjectPath("gradle/karma.config.d"))
-                }
-            }
-        }
-        nodejs {
-            testTask {
-                timeout = Duration.ofSeconds(240)
-                nodeJsArgs.add("--unhandled-rejections=warn")
-                nodeJsArgs.add("--trace-warnings")
-            }
-        }
-    }
-    androidTarget {
-        publishAllLibraryVariants()
-        compilations.all {
-            kotlinOptions {
-                jvmTarget = "17"
-            }
-        }
-    }
-
-    sourceSets {
-        commonMain {
-            dependencies {
-                implementation kotlin('stdlib')
-                implementation compose.runtime
-                api libs.kt.serialization
-            }
-        }
-        commonTest {
-            dependencies {
-                implementation kotlin('test-common')
-                implementation kotlin('test-annotations-common')
-                implementation libs.kt.coroutines.test
-            }
-        }
-        jvmMain {
-            dependencies {
-                implementation compose.desktop.currentOs
-            }
-        }
-        jvmTest {
-            dependencies {
-                implementation kotlin('test-junit')
-                implementation compose.uiTest
-            }
-        }
-        jsMain {
-            dependencies {
-                implementation compose.web.core
-            }
-        }
-        jsTest {
-            dependencies {
-                implementation kotlin('test-js')
-            }
-        }
-        wasmJsTest {
-            dependencies {
-                implementation kotlin('test-wasm-js')
-            }
-        }
-        androidUnitTest {
-            dependencies {
-                implementation kotlin('test-junit')
-                implementation libs.android.test.junit
-                implementation libs.android.espresso
-                implementation compose.uiTest
-            }
-        }
-    }
-}
-
-apply from: "$defaultAndroidSettings"
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
-
-
-//compose {
-//    if (composePluginKotlinVersion != null && !composePluginKotlinVersion.isEmpty()) {
-//        kotlinCompilerPlugin.set(composePluginKotlinVersion)
-//    }
-//}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists