Move to Kotlin 1.9.23, refactor Gradle file and source set directories

README.md

@@ -82,7 +82,7 @@ commonMain {
 License
 =======
 
-    Copyright 2022 Touchlab, Inc.
+    Copyright 2024 Touchlab, Inc.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

build.gradle.kts

@@ -26,12 +26,4 @@ val VERSION_NAME: String by project
 allprojects {
     group = GROUP
     version = VERSION_NAME
-}
-
-allprojects {
-    repositories {
-        mavenCentral()
-        google()
-        maven("https://maven.pkg.jetbrains.space/kotlin/p/wasm/experimental")
-    }
 }

deprecated/stately-collections/build.gradle

@@ -23,13 +23,12 @@ configurations {
     compileClasspath
 }
 kotlin {
-    targetHierarchy.default {}
     jvm()
     js {
         nodejs()
         browser()
     }
-    wasm {
+    wasmJs {
         browser()
         binaries.executable()
     }
@@ -56,6 +55,15 @@ kotlin {
     androidNativeX86()
     androidNativeX64()
 
+    applyDefaultHierarchyTemplate {
+        it.common {
+            it.group("jsAndWasmJs") {
+                it.withJs()
+                it.withWasm()
+            }
+        }
+    }
+
     sourceSets {
         commonMain {
             dependencies {
@@ -70,103 +78,6 @@ kotlin {
                 implementation libs.testHelp
             }
         }
-
-        create("jsWasmMain") {
-            dependsOn commonMain
-        }
-
-        create("jsWasmTest") {
-            dependsOn commonTest
-        }
-
-        jsMain {
-            dependsOn jsWasmMain
-        }
-        jsTest {
-            dependsOn jsWasmTest
-        }
-
-        wasmMain {
-            dependsOn jsWasmMain
-        }
-        wasmTest {
-            dependsOn jsWasmTest
-        }
-
-        nativeCommonMain {
-            dependsOn commonMain
-        }
-        nativeCommonTest {
-            dependsOn commonTest
-        }
-
-        macosX64Main {
-            dependsOn nativeCommonMain
-        }
-        iosArm64Main {
-            dependsOn nativeCommonMain
-        }
-        iosX64Main {
-            dependsOn nativeCommonMain
-        }
-        watchosArm32Main {
-            dependsOn nativeCommonMain
-        }
-        watchosArm64Main {
-            dependsOn nativeCommonMain
-        }
-        watchosX64Main {
-            dependsOn nativeCommonMain
-        }
-        watchosDeviceArm64Main {
-            dependsOn nativeCommonMain
-        }
-        tvosArm64Main {
-            dependsOn nativeCommonMain
-        }
-        tvosX64Main {
-            dependsOn nativeCommonMain
-        }
-
-        macosArm64Main {
-            dependsOn nativeCommonMain
-        }
-        iosSimulatorArm64Main {
-            dependsOn nativeCommonMain
-        }
-        watchosSimulatorArm64Main {
-            dependsOn nativeCommonMain
-        }
-        tvosSimulatorArm64Main {
-            dependsOn nativeCommonMain
-        }
-
-        mingwX64Main {
-            dependsOn nativeCommonMain
-        }
-
-        linuxX64Main {
-            dependsOn nativeCommonMain
-        }
-        linuxArm64Main {
-            dependsOn nativeCommonMain
-        }
-
-        androidNativeArm32Main {
-            dependsOn nativeCommonMain
-        }
-
-        androidNativeArm64Main {
-            dependsOn nativeCommonMain
-        }
-
-        androidNativeX86Main {
-            dependsOn nativeCommonMain
-        }
-
-        androidNativeX64Main {
-            dependsOn nativeCommonMain
-        }
     }
 }
 

deprecated/stately-collections/src/nativeCommonMain/kotlin/co/touchlab/stately/collections/CopyOnWriteList.kt → deprecated/stately-collections/src/nativeMain/kotlin/co/touchlab/stately/collections/CopyOnWriteList.kt

@@ -17,8 +17,8 @@
 package co.touchlab.stately.collections
 
 import co.touchlab.stately.concurrency.Lock
-import kotlin.native.concurrent.AtomicInt
-import kotlin.native.concurrent.AtomicReference
+import kotlin.concurrent.AtomicInt
+import kotlin.concurrent.AtomicReference
 import kotlin.native.concurrent.freeze
 
 class CopyOnWriteList<T>(elements: Collection<T>) : MutableList<T> {

deprecated/stately-common/build.gradle

@@ -19,13 +19,12 @@ group = GROUP
 version = VERSION_NAME
 
 kotlin {
-    targetHierarchy.default {}
     jvm()
     js {
         nodejs()
         browser()
     }
-    wasm {
+    wasmJs {
         browser()
         binaries.executable()
     }
@@ -53,6 +52,15 @@ kotlin {
     androidNativeX86()
     androidNativeX64()
 
+    applyDefaultHierarchyTemplate {
+        it.common {
+            it.group("jsAndWasmJs") {
+                it.withJs()
+                it.withWasm()
+            }
+        }
+    }
+
     sourceSets {
         commonMain {}
 
@@ -62,103 +70,6 @@ kotlin {
                 implementation libs.testHelp
             }
         }
-
-        create("jsWasmMain") {
-            dependsOn commonMain
-        }
-
-        create("jsWasmTest") {
-            dependsOn commonTest
-        }
-
-        jsMain {
-            dependsOn jsWasmMain
-        }
-        jsTest {
-            dependsOn jsWasmTest
-        }
-
-        wasmMain {
-            dependsOn jsWasmMain
-        }
-        wasmTest {
-            dependsOn jsWasmTest
-        }
-
-        nativeCommonMain {
-            dependsOn commonMain
-        }
-        nativeCommonTest {
-            dependsOn commonTest
-        }
-
-        macosX64Main {
-            dependsOn nativeCommonMain
-        }
-        iosArm64Main {
-            dependsOn nativeCommonMain
-        }
-        iosX64Main {
-            dependsOn nativeCommonMain
-        }
-        watchosArm32Main {
-            dependsOn nativeCommonMain
-        }
-        watchosArm64Main {
-            dependsOn nativeCommonMain
-        }
-        watchosX64Main {
-            dependsOn nativeCommonMain
-        }
-        watchosDeviceArm64Main {
-            dependsOn nativeCommonMain
-        }
-        tvosArm64Main {
-            dependsOn nativeCommonMain
-        }
-        tvosX64Main {
-            dependsOn nativeCommonMain
-        }
-
-        macosArm64Main {
-            dependsOn nativeCommonMain
-        }
-        iosSimulatorArm64Main {
-            dependsOn nativeCommonMain
-        }
-        watchosSimulatorArm64Main {
-            dependsOn nativeCommonMain
-        }
-        tvosSimulatorArm64Main {
-            dependsOn nativeCommonMain
-        }
-
-        mingwX64Main {
-            dependsOn nativeCommonMain
-        }
-
-        linuxX64Main {
-            dependsOn nativeCommonMain
-        }
-        linuxArm64Main {
-            dependsOn nativeCommonMain
-        }
-
-        androidNativeArm32Main {
-            dependsOn nativeCommonMain
-        }
-
-        androidNativeArm64Main {
-            dependsOn nativeCommonMain
-        }
-
-        androidNativeX86Main {
-            dependsOn nativeCommonMain
-        }
-
-        androidNativeX64Main {
-            dependsOn nativeCommonMain
-        }
     }
 }