From c4957848f05212e01ff284edb4af4443a40d69fb Mon Sep 17 00:00:00 2001 From: Maria Sokolova Date: Tue, 12 Dec 2023 00:31:38 +0100 Subject: [PATCH] This commit changes the order of configurations in the global buildscript: when atomicfu-gradle-plugin is not added to the classpath first, it is not applied at all. This behaviour started to reproduce after this change in kotlinx-atomicfu (https://github.com/Kotlin/kotlinx-atomicfu/pull/377). The problem was revealed while running a train build before kotlinx-atomicfu 0.23.2 release. The coroutines build failed with error: "e: Module kotlinx.atomicfu cannot be found in the module graph". --- build.gradle | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index f6c4cf31c7..d53727c52a 100644 --- a/build.gradle +++ b/build.gradle @@ -15,6 +15,11 @@ import static Projects.* apply plugin: 'jdk-convention' buildscript { + + dependencies { + classpath "org.jetbrains.kotlinx:atomicfu-gradle-plugin:$atomicfu_version" + } + /* * These property group is used to build kotlinx.coroutines against Kotlin compiler snapshot. * How does it work: @@ -59,11 +64,10 @@ buildscript { dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version" - classpath "org.jetbrains.kotlinx:atomicfu-gradle-plugin:$atomicfu_version" + classpath "org.jetbrains.kotlin:atomicfu:$kotlin_version" classpath "org.jetbrains.kotlinx:kotlinx-knit:$knit_version" classpath "org.jetbrains.kotlinx:binary-compatibility-validator:$binary_compatibility_validator_version" classpath "ru.vyarus:gradle-animalsniffer-plugin:1.5.4" // Android API check - classpath "org.jetbrains.kotlin:atomicfu:$kotlin_version" classpath "org.jetbrains.kotlinx:kover-gradle-plugin:$kover_version" // JMH plugins