Merge pull request #84 from rickclephas/feature/kotlin-2.1.0

Kotlin 2.1.0
rickclephas · Dec 8, 2024 · 36a1a55 · 36a1a55
2 parents a7596d7 + 9350ec1
commit 36a1a55
Show file tree

Hide file tree

Showing 5 changed files with 329 additions and 304 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,15 +9,11 @@ buildscript {
         mavenCentral()
         google()
     }
-
-    dependencies {
-        classpath(libs.atomicfu.gradle.plugin)
-    }
 }
 
 allprojects {
     group = "com.rickclephas.kmp"
-    version = "1.0.0-BETA-7"
+    version = "1.0.0-BETA-7-kotlin-2.1.0-RC2"
 
     repositories {
         mavenCentral()

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,21 +1,20 @@
 [versions]
-kotlin = "2.0.21"
+kotlin = "2.1.0"
 kotlinx-coroutines = "1.9.0"
 android = "8.2.0"
 androidx-lifecycle = "2.8.4"
-atomicfu = "0.24.0"
+atomicfu = "0.25.0"
 
 # Sample versions
 androidx-compose = "2023.10.01"
 androidx-fragment = "1.6.2"
-ksp = "2.0.21-1.0.25"
-nativecoroutines = "1.0.0-ALPHA-37"
+ksp = "2.1.0-1.0.29"
+nativecoroutines = "1.0.0-ALPHA-38"
 
 [libraries]
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
 androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel", version.ref = "androidx-lifecycle" }
-atomicfu-gradle-plugin = { module = "org.jetbrains.kotlinx:atomicfu-gradle-plugin", version.ref = "atomicfu" }
 
 # Sample libraries
 androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose" }
@@ -30,6 +29,7 @@ androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-
 [plugins]
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 android-library = { id = "com.android.library", version.ref = "android" }
+atomicfu = { id = "org.jetbrains.kotlinx.atomicfu", version.ref = "atomicfu" }
 
 # Sample plugins
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }

diff --git a/kmp-observableviewmodel-core/build.gradle.kts b/kmp-observableviewmodel-core/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.multiplatform)
     `kmp-observableviewmodel-publish`
-    id("kotlinx-atomicfu")
+    alias(libs.plugins.atomicfu)
 }
 
 kotlin {