Kotlin 2.0.20 refresh + Uuid Integration

InsertKoinIO · Aug 23, 2024 · 926a7b6 · 926a7b6
1 parent 2fd3df6
commit 926a7b6
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 54 deletions.
diff --git a/projects/compose/koin-compose-viewmodel/build.gradle.kts b/projects/compose/koin-compose-viewmodel/build.gradle.kts
@@ -24,8 +24,8 @@ kotlin {
     }
 
     wasmJs {
-        binaries.executable()
         nodejs()
+        binaries.executable()
     }
 
     iosX64()
@@ -50,17 +50,6 @@ tasks.withType<KotlinCompile>().all {
     }
 }
 
-rootProject.the<NodeJsRootExtension>().apply {
-    nodeVersion = "21.0.0-v8-canary202309143a48826a08"
-    nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"
-}
-
-tasks.withType<KotlinCompile>().all {
-    compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_1_8)
-    }
-}
-
 tasks.withType<org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask>().configureEach {
     args.add("--ignore-engines")
 }

diff --git a/projects/compose/koin-compose/build.gradle.kts b/projects/compose/koin-compose/build.gradle.kts
@@ -1,5 +1,4 @@
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -24,8 +23,8 @@ kotlin {
     }
 
     wasmJs {
-        binaries.executable()
         nodejs()
+        binaries.executable()
     }
 
     iosX64()
@@ -48,19 +47,10 @@ tasks.withType<KotlinCompile>().all {
     }
 }
 
-rootProject.the<NodeJsRootExtension>().apply {
-    nodeVersion = "21.0.0-v8-canary202309143a48826a08"
-    nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"
-}
-
 tasks.withType<KotlinCompile>().all {
     compilerOptions {
         jvmTarget.set(JvmTarget.JVM_1_8)
     }
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask>().configureEach {
-    args.add("--ignore-engines")
-}
-
 apply(from = file("../../gradle/publish.gradle.kts"))
diff --git a/projects/core/koin-core-viewmodel/build.gradle.kts b/projects/core/koin-core-viewmodel/build.gradle.kts
@@ -50,19 +50,10 @@ tasks.withType<KotlinCompile>().all {
     }
 }
 
-rootProject.the<NodeJsRootExtension>().apply {
-    nodeVersion = "21.0.0-v8-canary202309143a48826a08"
-    nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"
-}
-
 tasks.withType<KotlinCompile>().all {
     compilerOptions {
         jvmTarget.set(JvmTarget.JVM_1_8)
     }
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask>().configureEach {
-    args.add("--ignore-engines")
-}
-
 apply(from = file("../../gradle/publish.gradle.kts"))
diff --git a/projects/core/koin-core/build.gradle.kts b/projects/core/koin-core/build.gradle.kts
@@ -20,8 +20,8 @@ kotlin {
     }
 
     wasmJs {
-        binaries.executable()
         nodejs()
+        binaries.executable()
     }
 
     iosX64()
@@ -45,7 +45,7 @@ kotlin {
         commonMain.dependencies {
             api(libs.extras.stately)
             api(libs.extras.stately.collections)
-            api(libs.extras.uuid)
+//            api(libs.extras.uuid)
         }
         commonTest.dependencies {
             implementation(libs.kotlin.test)
@@ -61,12 +61,4 @@ tasks.withType<KotlinCompile>().all {
         }
 }
 
-rootProject.the<NodeJsRootExtension>().apply {
-    nodeVersion = "21.0.0-v8-canary202309143a48826a08"
-    nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"
-}
-
-tasks.withType<org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask>().configureEach {
-    args.add("--ignore-engines")
-}
 apply(from = file("../../gradle/publish.gradle.kts"))
diff --git a/projects/core/koin-core/src/commonMain/kotlin/org/koin/mp/KoinPlatformTools.kt b/projects/core/koin-core/src/commonMain/kotlin/org/koin/mp/KoinPlatformTools.kt
@@ -15,11 +15,12 @@
  */
 package org.koin.mp
 
-import com.benasher44.uuid.uuid4
 import org.koin.core.context.KoinContext
 import org.koin.core.logger.Level
 import org.koin.core.logger.Logger
 import kotlin.reflect.KClass
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
 expect object KoinPlatformTools {
     fun getStackTrace(e: Exception): String
@@ -33,5 +34,6 @@ expect object KoinPlatformTools {
 }
 
 fun KoinPlatformTools.getKClassDefaultName(kClass: KClass<*>) : String = "KClass@${kClass.hashCode()}"
-fun KoinPlatformTools.generateId() : String = uuid4().toString()
+@OptIn(ExperimentalUuidApi::class)
+fun KoinPlatformTools.generateId() : String = Uuid.random().toString()
 
diff --git a/projects/core/koin-test/build.gradle.kts b/projects/core/koin-test/build.gradle.kts
@@ -18,8 +18,8 @@ kotlin {
         binaries.executable()
     }
     wasmJs {
-        binaries.executable()
         nodejs()
+        binaries.executable()
     }
 
     iosX64()
@@ -59,13 +59,5 @@ tasks.withType<KotlinCompile>().all {
             jvmTarget.set(JvmTarget.JVM_1_8)
         }
 }
-rootProject.the<NodeJsRootExtension>().apply {
-    nodeVersion = "21.0.0-v8-canary202309143a48826a08"
-    nodeDownloadBaseUrl = "https://nodejs.org/download/v8-canary"
-}
-
-tasks.withType<org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask>().configureEach {
-    args.add("--ignore-engines")
-}
 
 apply(from = file("../../gradle/publish.gradle.kts"))
diff --git a/projects/gradle/libs.versions.toml b/projects/gradle/libs.versions.toml
@@ -3,7 +3,7 @@
 # /!\ Koin in gradle.properties /!\
 
 # Core
-kotlin = "2.0.0"
+kotlin = "2.0.20"
 binaryValidator = "0.16.0"
 publish = "2.0.0"
 coroutines = "1.8.1"