From fe3352c84afa9f19524d283665d348ea460124b2 Mon Sep 17 00:00:00 2001
From: Travis Wyatt <travis@juul.com>
Date: Mon, 11 Mar 2024 13:55:17 -0700
Subject: [PATCH] Update AtomicFU configuration (#351)

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
---
 build.gradle.kts          | 4 +++-
 gradle/libs.versions.toml | 2 +-
 settings.gradle.kts       | 3 ---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 45ce27b4..1e2e5b6f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -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
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f800308d..daf9f5d1 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -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" }
@@ -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" }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index c38fac84..983de26a 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -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}")