Merge pull request #162 from arkivanov/update-reaktive-and-coroutines

Updated Reaktive to 2.1.0 and coroutines to 1.8.0
arkivanov · Apr 5, 2024 · 33179f5 · 33179f5
2 parents 14e8405 + 799dc04
commit 33179f5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 28 deletions.
diff --git a/deps.versions.toml b/deps.versions.toml
@@ -3,7 +3,7 @@
 essenty = "2.0.0-beta01"
 kotlin = "1.9.21"
 kotlinxBinaryCompatibilityValidator = "0.13.2"
-kotlinxCoroutines = "1.8.0-RC" # Remove workaround from lifecycle-coroutines
+kotlinxCoroutines = "1.8.0"
 detektGradlePlugin = "1.23.3"
 junit = "4.13.2"
 androidGradle = "8.0.2"
@@ -12,7 +12,7 @@ androidxSavedstate = "1.2.1"
 androidxActivity = "1.8.1"
 jetbrainsKotlinxSerialization = "1.6.2"
 robolectric = "4.9.1"
-reaktive = "2.0.1" # Remove all workarounds when WASM is supported
+reaktive = "2.1.0"
 
 [libraries]
 

diff --git a/lifecycle-coroutines/build.gradle.kts b/lifecycle-coroutines/build.gradle.kts
@@ -22,9 +22,6 @@ kotlin {
         common.main.dependencies {
             implementation(project(":lifecycle"))
             implementation(deps.kotlinx.coroutinesCore)
-
-            // Workaround: https://github.com/Kotlin/kotlinx.coroutines/issues/3968
-            implementation("org.jetbrains.kotlinx:atomicfu:0.23.1")
         }
 
         common.test.dependencies {

diff --git a/lifecycle-reaktive/build.gradle.kts b/lifecycle-reaktive/build.gradle.kts
@@ -1,33 +1,15 @@
-import com.arkivanov.gradle.iosCompat
-import com.arkivanov.gradle.macosCompat
 import com.arkivanov.gradle.setupBinaryCompatibilityValidator
 import com.arkivanov.gradle.setupMultiplatform
 import com.arkivanov.gradle.setupPublication
 import com.arkivanov.gradle.setupSourceSets
-import com.arkivanov.gradle.tvosCompat
-import com.arkivanov.gradle.watchosCompat
 
 plugins {
     id("kotlin-multiplatform")
     id("com.android.library")
     id("com.arkivanov.gradle.setup")
 }
 
-// Reaktive doesn't support wasm yet
-setupMultiplatform {
-    androidTarget()
-    jvm()
-    js {
-        browser()
-        nodejs()
-    }
-    linuxX64()
-    iosCompat()
-    watchosCompat()
-    tvosCompat()
-    macosCompat()
-}
-
+setupMultiplatform()
 setupPublication()
 setupBinaryCompatibilityValidator()
 

diff --git a/tools/check-publication/build.gradle.kts b/tools/check-publication/build.gradle.kts
@@ -30,10 +30,7 @@ kotlin {
             implementation("com.arkivanov.essenty:instance-keeper:$version")
             implementation("com.arkivanov.essenty:lifecycle:$version")
             implementation("com.arkivanov.essenty:lifecycle-coroutines:$version")
-
-            // Reaktive doesn't support WASM yet, exclude it from publication checks for now
-//            implementation("com.arkivanov.essenty:lifecycle-reaktive:$version")
-
+            implementation("com.arkivanov.essenty:lifecycle-reaktive:$version")
             implementation("com.arkivanov.essenty:state-keeper:$version")
         }
     }