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

#110)
touchlab · Mar 21, 2024 · 021b778 · 021b778
1 parent 6f97449
commit 021b778
Show file tree

Hide file tree

Showing 60 changed files with 823 additions and 2,270 deletions.
diff --git a/.yarnrc b/.yarnrc
@@ -0,0 +1 @@
+--ignore-engines true
diff --git a/README.md b/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.

diff --git a/build.gradle.kts b/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")
-    }
 }
diff --git a/convention-plugins/build.gradle.kts b/convention-plugins/build.gradle.kts
@@ -0,0 +1,7 @@
+plugins {
+    `kotlin-dsl`
+}
+
+dependencies {
+    implementation(libs.kotlin.gradlePlugin)
+}
diff --git a/convention-plugins/settings.gradle.kts b/convention-plugins/settings.gradle.kts
@@ -0,0 +1,10 @@
+dependencyResolutionManagement {
+    repositories {
+        gradlePluginPortal()
+    }
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
diff --git a/convention-plugins/src/main/kotlin/kmp-setup.gradle.kts b/convention-plugins/src/main/kotlin/kmp-setup.gradle.kts
@@ -0,0 +1,67 @@
+import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
+
+plugins {
+    kotlin("multiplatform")
+}
+
+kotlin {
+    @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
+    compilerOptions {
+        freeCompilerArgs.add("-Xexpect-actual-classes")
+    }
+    jvm()
+    js {
+        nodejs {
+            testTask {
+                useMocha {
+                    // Override default timeout (needed for stress tests)
+                    timeout = "120s"
+                }
+            }
+        }
+        browser()
+    }
+    @OptIn(org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl::class)
+    wasmJs {
+        browser()
+        nodejs()
+    }
+    macosX64()
+    iosArm64()
+    iosX64()
+    watchosArm32()
+    watchosArm64()
+    watchosX64()
+    watchosDeviceArm64()
+    tvosArm64()
+    tvosX64()
+
+    macosArm64()
+    iosSimulatorArm64()
+    watchosSimulatorArm64()
+    tvosSimulatorArm64()
+
+    mingwX64()
+    linuxX64()
+    linuxArm64()
+
+    androidNativeArm32()
+    androidNativeArm64()
+    androidNativeX86()
+    androidNativeX64()
+
+    @Suppress("OPT_IN_USAGE")
+    applyDefaultHierarchyTemplate {
+        common {
+            group("jsAndWasmJs") {
+                withJs()
+                withWasm()
+            }
+        }
+    }
+}
+
+rootProject.the<NodeJsRootExtension>().apply {
+    nodeVersion = "21.0.0-v8-canary202309143a48826a08"
+    nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"
+}
diff --git a/deprecated/stately-collections/build.gradle b/deprecated/stately-collections/build.gradle
@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 
-apply plugin: 'org.jetbrains.kotlin.multiplatform'
+plugins {
+    id 'org.jetbrains.kotlin.multiplatform'
+    id 'kmp-setup'
+    id 'com.vanniktech.maven.publish'
+}
 
 group = GROUP
 version = VERSION_NAME
@@ -23,39 +27,6 @@ configurations {
     compileClasspath
 }
 kotlin {
-    targetHierarchy.default {}
-    jvm()
-    js {
-        nodejs()
-        browser()
-    }
-    wasm {
-        browser()
-        binaries.executable()
-    }
-    macosX64()
-    iosArm64()
-    iosX64()
-    watchosArm32()
-    watchosArm64()
-    watchosX64()
-    watchosDeviceArm64()
-    tvosArm64()
-    tvosX64()
-    mingwX64()
-    linuxX64()
-    linuxArm64()
-
-    macosArm64()
-    iosSimulatorArm64()
-    watchosSimulatorArm64()
-    tvosSimulatorArm64()
-
-    androidNativeArm32()
-    androidNativeArm64()
-    androidNativeX86()
-    androidNativeX64()
-
     sourceSets {
         commonMain {
             dependencies {
@@ -70,104 +41,5 @@ 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
-        }
     }
-}
-
-apply plugin:"com.vanniktech.maven.publish"
+}
diff --git a/...touchlab/stately/collections/Functions.kt → ...touchlab/stately/collections/Functions.kt b/...touchlab/stately/collections/Functions.kt → ...touchlab/stately/collections/Functions.kt
diff --git a/.../touchlab/stately/collections/JsIgnore.kt → .../touchlab/stately/collections/JsIgnore.kt b/.../touchlab/stately/collections/JsIgnore.kt → .../touchlab/stately/collections/JsIgnore.kt
diff --git a/...ab/stately/collections/CopyOnWriteList.kt → ...ab/stately/collections/CopyOnWriteList.kt b/...ab/stately/collections/CopyOnWriteList.kt → ...ab/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> {

diff --git a/...touchlab/stately/collections/Functions.kt → ...touchlab/stately/collections/Functions.kt b/...touchlab/stately/collections/Functions.kt → ...touchlab/stately/collections/Functions.kt