From d5aedb0ef5995f4b841f385197a7b5f327ce8465 Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 29 Dec 2022 19:08:58 -0500 Subject: [PATCH] Expose AtomicFU (#505) Signed-off-by: mramotar Signed-off-by: mramotar --- build.gradle.kts | 2 +- buildSrc/src/main/kotlin/Deps.kt | 1 + buildSrc/src/main/kotlin/Version.kt | 2 +- cache/build.gradle.kts | 8 +++++++- multicast/build.gradle.kts | 5 ++++- store/build.gradle.kts | 1 + 6 files changed, 15 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d063c1f..55d5e64 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,7 +22,7 @@ buildscript { classpath("org.jetbrains.kotlinx:kover:${Version.kover}") classpath("com.squareup.anvil:gradle-plugin:${Version.anvilGradlePlugin}") classpath("com.squareup.sqldelight:gradle-plugin:${Version.sqlDelightGradlePlugin}") - classpath("org.jetbrains.kotlinx:atomicfu-gradle-plugin:${Version.atomicFuGradlePlugin}") + classpath("org.jetbrains.kotlinx:atomicfu-gradle-plugin:${Version.atomicFu}") } } diff --git a/buildSrc/src/main/kotlin/Deps.kt b/buildSrc/src/main/kotlin/Deps.kt index fc09da2..5c8f15b 100644 --- a/buildSrc/src/main/kotlin/Deps.kt +++ b/buildSrc/src/main/kotlin/Deps.kt @@ -33,6 +33,7 @@ object Deps { } object Kotlinx { + const val atomicFu = "org.jetbrains.kotlinx:atomicfu:${Version.atomicFu}" const val stdLib = "org.jetbrains.kotlin:kotlin-stdlib:${Version.baseKotlin}" const val serializationCore = "org.jetbrains.kotlinx:kotlinx-serialization-core:${Version.kotlinxSerialization}" const val serializationJson = "org.jetbrains.kotlinx:kotlinx-serialization-json:${Version.kotlinxSerialization}" diff --git a/buildSrc/src/main/kotlin/Version.kt b/buildSrc/src/main/kotlin/Version.kt index ef8dedb..2007af0 100644 --- a/buildSrc/src/main/kotlin/Version.kt +++ b/buildSrc/src/main/kotlin/Version.kt @@ -5,7 +5,7 @@ object Version { const val androidGradlePlugin = "7.2.2" const val androidTargetSdk = androidCompileSdk const val anvilGradlePlugin = "2.4.2" - const val atomicFuGradlePlugin = "0.18.5" + const val atomicFu = "0.18.5" const val baseKotlin = "1.7.21" const val binaryCompatibilityValidator = "0.12.1" const val composeAndroidX = "1.3.0-beta02" diff --git a/cache/build.gradle.kts b/cache/build.gradle.kts index b12feb2..71e0d3b 100644 --- a/cache/build.gradle.kts +++ b/cache/build.gradle.kts @@ -40,7 +40,13 @@ kotlin { } } - val commonMain by getting + val commonMain by getting { + dependencies { + with(Deps.Kotlinx) { + api(atomicFu) + } + } + } val jvmMain by getting val androidMain by getting val nativeMain by creating { diff --git a/multicast/build.gradle.kts b/multicast/build.gradle.kts index 37cc895..e859cbe 100644 --- a/multicast/build.gradle.kts +++ b/multicast/build.gradle.kts @@ -42,7 +42,10 @@ kotlin { val commonMain by getting { dependencies { - implementation(Deps.Kotlinx.coroutinesCore) + with(Deps.Kotlinx) { + api(atomicFu) + implementation(coroutinesCore) + } } } val jvmMain by getting diff --git a/store/build.gradle.kts b/store/build.gradle.kts index c75b715..51cdb29 100644 --- a/store/build.gradle.kts +++ b/store/build.gradle.kts @@ -47,6 +47,7 @@ kotlin { implementation(coroutinesCore) implementation(serializationCore) implementation(dateTime) + api(atomicFu) } implementation(Deps.Touchlab.kermit) implementation(project(":multicast"))