Skip to content

Commit

Permalink
Update AtomicFU configuration (#351)
Browse files Browse the repository at this point in the history
Now pulling in AtomicFU via `classpath` in `buildscript.dependencies` as
it more closely aligns with official [setup instructions].

[setup instructions]: https://github.com/Kotlin/kotlinx-atomicfu?tab=readme-ov-file#apply-plugin
  • Loading branch information
twyatt authored Mar 11, 2024
1 parent 087e7b4 commit fe3352c
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
4 changes: 3 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ buildscript {
google()
mavenCentral()
}
dependencies {
classpath(libs.atomicfu)
}
}

plugins {
alias(libs.plugins.kotlin.multiplatform) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.atomicfu) apply false
alias(libs.plugins.kotlinter) apply false
alias(libs.plugins.dokka)
alias(libs.plugins.android.publish) apply false
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ ktor = "2.3.9"
[libraries]
androidx-core = { module = "androidx.core:core", version = "1.12.0" }
androidx-startup = { module = "androidx.startup:startup-runtime", version = "1.1.1" }
atomicfu = { module = "org.jetbrains.kotlinx:atomicfu-gradle-plugin", version = "0.23.1" }
kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version = "0.3.7" }
kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
Expand All @@ -21,7 +22,6 @@ ktor-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" }
[plugins]
android-library = { id = "com.android.library", version = "8.3.0" }
android-publish = { id = "com.vanniktech.maven.publish", version = "0.27.0" }
atomicfu = { id = "kotlinx-atomicfu", version = "0.23.1" }
binary-compatibility-validator = { id = "binary-compatibility-validator", version = "0.14.0" }
dokka = { id = "org.jetbrains.dokka", version = "1.9.10" }
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
Expand Down
3 changes: 0 additions & 3 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ pluginManagement {
"binary-compatibility-validator" ->
useModule("org.jetbrains.kotlinx:binary-compatibility-validator:${requested.version}")

"kotlinx-atomicfu" ->
useModule("org.jetbrains.kotlinx:atomicfu-gradle-plugin:${requested.version}")

else -> when (requested.id.namespace) {
"com.android" ->
useModule("com.android.tools.build:gradle:${requested.version}")
Expand Down

0 comments on commit fe3352c

Please sign in to comment.