From 56a9c40e7e6eebd122f365dc98981e496b6ee7ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andre=20Cla=C3=9Fen?= Date: Mon, 20 Feb 2023 22:57:42 +0100 Subject: [PATCH 1/2] Removed atomicFu plugin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andre Claßen --- README.md | 6 ------ cache/build.gradle.kts | 3 +-- multicast/build.gradle.kts | 3 +-- store/build.gradle.kts | 8 +------- 4 files changed, 3 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 6d90fb4bf..830087697 100644 --- a/README.md +++ b/README.md @@ -29,14 +29,9 @@ ### Including Store In Your Project -> **Note** -> -> **[AtomicFU](https://github.com/Kotlin/kotlinx-atomicfu) is required ([#503](https://github.com/MobileNativeFoundation/Store/issues/503))** - #### Android ```kotlin implementation "org.mobilenativefoundation.store:store5:5.0.0-alpha03" -api "org.jetbrains.kotlinx:atomicfu:0.18.5" ``` #### Multiplatform (Common, JVM, Native, JS) @@ -45,7 +40,6 @@ api "org.jetbrains.kotlinx:atomicfu:0.18.5" commonMain { dependencies { implementation("org.mobilenativefoundation.store:store5:5.0.0-alpha03") - api("org.jetbrains.kotlinx:atomicfu:0.18.5") } } ``` diff --git a/cache/build.gradle.kts b/cache/build.gradle.kts index 71e0d3b41..6f3be8854 100644 --- a/cache/build.gradle.kts +++ b/cache/build.gradle.kts @@ -13,7 +13,6 @@ plugins { id("co.touchlab.faktory.kmmbridge") version Version.kmmBridge `maven-publish` kotlin("native.cocoapods") - id("kotlinx-atomicfu") } kotlin { @@ -43,7 +42,7 @@ kotlin { val commonMain by getting { dependencies { with(Deps.Kotlinx) { - api(atomicFu) + implementation(atomicFu) } } } diff --git a/multicast/build.gradle.kts b/multicast/build.gradle.kts index e859cbefc..c8c487c28 100644 --- a/multicast/build.gradle.kts +++ b/multicast/build.gradle.kts @@ -13,7 +13,6 @@ plugins { id("co.touchlab.faktory.kmmbridge") version Version.kmmBridge `maven-publish` kotlin("native.cocoapods") - id("kotlinx-atomicfu") } kotlin { @@ -43,7 +42,7 @@ kotlin { val commonMain by getting { dependencies { with(Deps.Kotlinx) { - api(atomicFu) + implementation(atomicFu) implementation(coroutinesCore) } } diff --git a/store/build.gradle.kts b/store/build.gradle.kts index 51cdb29ad..c2501932d 100644 --- a/store/build.gradle.kts +++ b/store/build.gradle.kts @@ -13,7 +13,6 @@ plugins { id("co.touchlab.faktory.kmmbridge") version Version.kmmBridge `maven-publish` kotlin("native.cocoapods") - id("kotlinx-atomicfu") } kotlin { @@ -47,7 +46,7 @@ kotlin { implementation(coroutinesCore) implementation(serializationCore) implementation(dateTime) - api(atomicFu) + implementation(atomicFu) } implementation(Deps.Touchlab.kermit) implementation(project(":multicast")) @@ -135,8 +134,3 @@ koverMerged { onCheck.set(true) } } - -atomicfu { - transformJvm = false - transformJs = false -} From 426b739867d3f27b6129039395f3ce18c56bd368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andre=20Cla=C3=9Fen?= Date: Sat, 25 Feb 2023 21:37:23 +0100 Subject: [PATCH 2/2] Add atomicfu to jvm target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andre Claßen --- store/build.gradle.kts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/store/build.gradle.kts b/store/build.gradle.kts index 1ca739314..7c81865ca 100644 --- a/store/build.gradle.kts +++ b/store/build.gradle.kts @@ -67,7 +67,13 @@ kotlin { } } - val jvmMain by getting + val jvmMain by getting { + dependencies { + with(Deps.Kotlinx) { + implementation(atomicFu) + } + } + } val androidMain by getting val nativeMain by creating { dependsOn(commonMain)