improve handling of BCV and atomicfu plugins

build-logic/build.gradle.kts

@@ -20,4 +20,6 @@ plugins {
 
 dependencies {
     implementation(libs.kotlin.gradle.plugin)
+    implementation(libs.kotlinx.bcv.gradle.plugin)
+    implementation(libs.kotlinx.atomicfu.gradle.plugin)
 }

build-logic/src/main/kotlin/rsocketbuild.atomicfu.gradle.kts

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2015-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// this convention plugin will be not needed after https://github.com/Kotlin/kotlinx-atomicfu/issues/56
+plugins {
+    id("kotlinx-atomicfu")
+}

build-logic/src/main/kotlin/rsocketbuild.multiplatform-library.gradle.kts

@@ -17,6 +17,7 @@
 plugins {
     id("rsocketbuild.multiplatform-base")
     id("rsocketbuild.publication")
+    id("org.jetbrains.kotlinx.binary-compatibility-validator")
 }
 
 kotlin {

build.gradle.kts

@@ -16,27 +16,8 @@
 
 import org.jetbrains.kotlin.gradle.targets.js.yarn.*
 
-buildscript {
-    dependencies {
-        // kotlinx.atomicfu should be on classpath
-        //  it's an implementation detail of kotlinx.atomicfu gradle plugin
-        classpath(libs.kotlin.gradle.plugin)
-        classpath(libs.kotlinx.atomicfu.gradle.plugin)
-    }
-}
-
 plugins {
-    // for now BCV uses `allProjects` internally, so we can't apply it just to specific subprojects
-    alias(libs.plugins.kotlinx.bcv)
-}
-
-apiValidation {
-    ignoredProjects.addAll(
-        listOf(
-            "rsocket-test",
-            "rsocket-transport-tests"
-        )
-    )
+    alias(libs.plugins.kotlin.multiplatform) apply false
 }
 
 plugins.withType<YarnPlugin> {

gradle/libs.versions.toml

@@ -56,10 +56,8 @@ rsocket-java-transport-local = { module = 'io.rsocket:rsocket-transport-local',
 
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlinx-atomicfu-gradle-plugin = { module = "org.jetbrains.kotlinx:atomicfu-gradle-plugin", version.ref = "kotlinx-atomicfu" }
+kotlinx-bcv-gradle-plugin = { module = "org.jetbrains.kotlinx:binary-compatibility-validator", version.ref = "kotlinx-bcv" }
 
 [plugins]
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
-
-
 kotlinx-benchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "kotlinx-benchmark" }
-kotlinx-bcv = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "kotlinx-bcv" }

rsocket-core/build.gradle.kts

@@ -18,7 +18,7 @@ import rsocketbuild.*
 
 plugins {
     id("rsocketbuild.multiplatform-library")
-    id("kotlinx-atomicfu")
+    id("rsocketbuild.atomicfu")
 }
 
 description = "rsocket-kotlin core functionality"

rsocket-test/build.gradle.kts

@@ -19,7 +19,7 @@ import rsocketbuild.*
 
 plugins {
     id("rsocketbuild.multiplatform-base")
-    id("kotlinx-atomicfu")
+    id("rsocketbuild.atomicfu")
 }
 
 @OptIn(ExperimentalKotlinGradlePluginApi::class)

rsocket-transport-tests/build.gradle.kts

@@ -19,7 +19,7 @@ import rsocketbuild.*
 
 plugins {
     id("rsocketbuild.multiplatform-base")
-    id("kotlinx-atomicfu")
+    id("rsocketbuild.atomicfu")
 }
 
 @OptIn(ExperimentalKotlinGradlePluginApi::class)

rsocket-transports/local/build.gradle.kts

@@ -18,7 +18,7 @@ import rsocketbuild.*
 
 plugins {
     id("rsocketbuild.multiplatform-library")
-    id("kotlinx-atomicfu")
+    id("rsocketbuild.atomicfu")
 }
 
 description = "rsocket-kotlin Local transport implementation"