Add a transitive dependency to the compiler plugin by atomicfu-gradle…

…-plugin. Do not require to add it manually. Fixes #384
Kotlin · Jan 9, 2024 · 4910c1e · 4910c1e
1 parent bab9117
commit 4910c1e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 40 deletions.
diff --git a/atomicfu-gradle-plugin/build.gradle b/atomicfu-gradle-plugin/build.gradle
@@ -24,6 +24,7 @@ dependencies {
     // Atomicfu compiler plugin dependency will be loaded to kotlinCompilerPluginClasspath
     // Atomicfu plugin will only be applied if the flag is set kotlinx.atomicfu.enableJsIrTransformation=true
     compileOnly "org.jetbrains.kotlin:atomicfu:$kotlin_version"
+    runtimeOnly "org.jetbrains.kotlin:atomicfu:🚂"
 
     testImplementation gradleTestKit()
     testImplementation 'org.jetbrains.kotlin:kotlin-test'

diff --git a/...icfu-gradle-plugin/src/main/kotlin/kotlinx/atomicfu/plugin/gradle/AtomicFUGradlePlugin.kt b/...icfu-gradle-plugin/src/main/kotlin/kotlinx/atomicfu/plugin/gradle/AtomicFUGradlePlugin.kt
@@ -45,42 +45,12 @@ open class AtomicFUGradlePlugin : Plugin<Project> {
         val pluginVersion = rootProject.buildscript.configurations.findByName("classpath")
             ?.allDependencies?.find { it.name == "atomicfu-gradle-plugin" }?.version
         extensions.add(EXTENSION_NAME, AtomicFUPluginExtension(pluginVersion))
-        checkClasspathForAtomicfuCompilerPlugin(pluginVersion)
         applyAtomicfuCompilerPlugin()
         configureDependencies()
         configureTasks()
     }
 }
 
-private fun Project.checkClasspathForAtomicfuCompilerPlugin(pluginVersion: String?) {
-    val kotlinVersion = getKotlinPluginVersion()
-    rootProject.buildscript.configurations.findByName("classpath")
-        ?.allDependencies?.find { it.group == "org.jetbrains.kotlin" && it.name == "atomicfu" }?.let { 
-            require(it.version == kotlinVersion) {
-                "Please ensure that the Kotlin version specified for the atomicfu compiler plugin matches the Kotlin version used in your project. \n" +
-                "You should use this dependency in your classpath: classpath(\"org.jetbrains.kotlin:atomicfu:$kotlinVersion\")\n\n" +
-                "For details about plugin application, please refer to the README section at: https://github.com/Kotlin/kotlinx-atomicfu/blob/master/README.md#apply-plugin"
-            }
-        }
-        ?: error("Please add a dependency to the atomicfu compiler plugin in the buildscript classpath configuration, " + 
-            "in addition to the atomicfu-gradle-plugin dependency:\n" +
-            "```\n" +    
-            "buildscript {\n" +
-            "    repositories {\n" +
-            "        mavenCentral() \n" +
-            "    }\n" +
-            "\n" +
-            "    dependencies {\n" +
-            "        classpath(\"org.jetbrains.kotlinx:atomicfu-gradle-plugin:$pluginVersion\")\n" +
-            "        classpath(\"org.jetbrains.kotlin:atomicfu:$kotlinVersion\")\n" +
-            "    }\n" +
-            "}\n\n" + 
-            "apply(plugin = \"kotlinx-atomicfu\")\n" +
-            "```\n\n" +
-            "For details about plugin application, please refer to the README section at: https://github.com/Kotlin/kotlinx-atomicfu/blob/master/README.md#apply-plugin"            
-        )
-}
-
 private fun Project.checkCompatibility() {
     val currentGradleVersion = GradleVersion.current()
     val kotlinVersion = getKotlinVersion()

diff --git a/integration-testing/examples/plugin-order-bug/build.gradle b/integration-testing/examples/plugin-order-bug/build.gradle
@@ -9,7 +9,6 @@ buildscript {
         // then atomicfu dependency is not added to the classpath
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${libs.versions.kotlinVersion.get()}")
         classpath("org.jetbrains.kotlinx:atomicfu-gradle-plugin:${libs.versions.atomicfuVersion.get()}")
-        classpath("org.jetbrains.kotlin:atomicfu:${libs.versions.kotlinVersion.get()}")
     }
 }
 
@@ -29,16 +28,16 @@ repositories {
 kotlin {
     jvm()
 
-    js()
+//    js(IR)
+//
+//    wasmJs {}
+//    wasmWasi {}
 
-    wasmJs {}
-    wasmWasi {}
-
-    macosArm64()
-    macosX64()
-    linuxArm64()
-    linuxX64()
-    mingwX64()
+//    macosArm64()
+//    macosX64()
+//    linuxArm64()
+//    linuxX64()
+//    mingwX64()
 
     sourceSets {
         commonMain {