Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated Reaktive to 2.1.0 and coroutines to 1.8.0 #162

Merged
merged 1 commit into from
Apr 5, 2024
Merged

Updated Reaktive to 2.1.0 and coroutines to 1.8.0 #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deps.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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]

Expand Down
3 changes: 0 additions & 3 deletions lifecycle-coroutines/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
20 changes: 1 addition & 19 deletions lifecycle-reaktive/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()

Expand Down
5 changes: 1 addition & 4 deletions tools/check-publication/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
Expand Down
Loading