Add atomicfu-gradle-plugin to classpath and fix application

Revert the name of the kotlinx-runtime-module in the resolution config WA for broken atomicfu compiler plugin dependency in kotlin 1.7.0 (See: Kotlin/kotlinx-atomicfu#232)
ktorio · Nov 12, 2023 · 487768c · 487768c
1 parent 262708b
commit 487768c
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 11 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -51,6 +51,10 @@ buildscript {
         gradlePluginPortal()
         maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
     }
+
+    dependencies {
+        classpath("org.jetbrains.kotlinx:atomicfu-gradle-plugin:${rootProject.properties["atomicfu_version"]}")
+    }
 }
 
 val releaseVersion: String? by extra
@@ -92,7 +96,6 @@ apply(from = "gradle/compatibility.gradle")
 plugins {
     id("org.jetbrains.dokka") version "1.9.10" apply false
     id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.13.2"
-    id("kotlinx-atomicfu") version "0.22.0" apply false
     id("com.osacky.doctor") version "0.9.0"
 }
 
@@ -142,6 +145,24 @@ allprojects {
         }
     }
 
+    configurations.all {
+        if (name == "metadataCompileClasspath") return@all
+        resolutionStrategy.dependencySubstitution.all {
+            if (name == "metadataCompileClasspath") return@all
+            val requestedComponent = requested
+            if (requestedComponent is ModuleComponentSelector &&
+                requestedComponent.group == "org.jetbrains.kotlin" &&
+                requestedComponent.module == "atomicfu"
+            ) {
+                if (name == "metadataCompileClasspath") return@all
+                useTarget(
+                    "${requestedComponent.group}:kotlinx-atomicfu-runtime:$kotlinVersion",
+                    "Using proper kotlinx-atomicfu-runtime instead of Gradle plugin"
+                )
+            }
+        }
+    }
+
     kotlin {
         if (!disabledExplicitApiModeProjects.contains(project.name)) explicitApi()
 

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -12,8 +12,10 @@ val buildSnapshotTrain = properties["build_snapshot_train"]?.toString()?.toBoole
 repositories {
     mavenCentral()
     maven("https://plugins.gradle.org/m2")
-    maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
-
+    maven("https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev")
+    maven("https://cache-redirector.jetbrains.com/plugins.gradle.org/m2")
+    maven("https://plugins.gradle.org/m2")
+    mavenLocal()
     if (buildSnapshotTrain) {
         mavenLocal()
     }
@@ -28,7 +30,10 @@ configurations.configureEach {
     if (isCanBeResolved) {
         attributes {
             @Suppress("UnstableApiUsage")
-            attribute(GradlePluginApiVersion.GRADLE_PLUGIN_API_VERSION_ATTRIBUTE, project.objects.named(GradleVersion.current().version))
+            attribute(
+                GradlePluginApiVersion.GRADLE_PLUGIN_API_VERSION_ATTRIBUTE,
+                project.objects.named(GradleVersion.current().version)
+            )
         }
     }
 }

diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
@@ -9,6 +9,7 @@ pluginManagement {
     repositories {
         maven("https://plugins.gradle.org/m2")
         maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev")
+        mavenCentral()
         if (build_snapshot_train?.toBoolean() == true) {
             mavenLocal()
         }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -8,13 +8,6 @@ pluginManagement {
         google()
         gradlePluginPortal()
     }
-    resolutionStrategy {
-        eachPlugin {
-            if (requested.id.id == "kotlinx-atomicfu") {
-                useModule("org.jetbrains.kotlinx:atomicfu-gradle-plugin:${requested.version}")
-            }
-        }
-    }
 }
 
 plugins {