Dependencies update (#265)

* update minor dependencies
* add more memory for Gradle
* improve handling of BCV and atomicfu plugins
* drop yarn, use just npm
* don't store package lock

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-settings/build.gradle.kts

@@ -19,7 +19,7 @@ plugins {
 }
 
 dependencies {
-    implementation("com.gradle:gradle-enterprise-gradle-plugin:3.16.2")
-    implementation("com.gradle:common-custom-user-data-gradle-plugin:1.12.1")
+    implementation("com.gradle:gradle-enterprise-gradle-plugin:3.17.3")
+    implementation("com.gradle:common-custom-user-data-gradle-plugin:2.0.1")
     implementation("org.gradle.toolchains:foojay-resolver:0.8.0")
 }

build-settings/src/main/kotlin/rsocketsettings.gradle.settings.gradle.kts

@@ -15,14 +15,16 @@
  */
 
 plugins {
-    id("com.gradle.enterprise")
+    id("com.gradle.develocity")
     id("com.gradle.common-custom-user-data-gradle-plugin")
     id("org.gradle.toolchains.foojay-resolver-convention")
 }
 
-gradleEnterprise {
+develocity {
     buildScan {
-        publishAlwaysIf(System.getenv("CI").toBoolean())
+        publishing {
+            onlyIf { System.getenv("CI").toBoolean() }
+        }
     }
 }
 

build.gradle.kts

@@ -14,34 +14,18 @@
  * limitations under the License.
  */
 
-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)
-    }
-}
+import org.jetbrains.kotlin.gradle.targets.js.nodejs.*
+import org.jetbrains.kotlin.gradle.targets.js.npm.*
 
 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> {
-    yarn.apply {
-        lockFileDirectory = file("gradle/js/yarn")
-        yarnLockMismatchReport = YarnLockMismatchReport.WARNING
+plugins.withType<NodeJsRootPlugin> {
+    // ignore package lock
+    extensions.configure<NpmExtension> {
+        lockFileDirectory.set(layout.buildDirectory.dir("kotlin-js-store"))
+        packageLockMismatchReport.set(LockFileMismatchReport.NONE)
+        packageLockAutoReplace.set(true)
     }
 }

gradle.properties

@@ -19,11 +19,12 @@ version=0.16.0-SNAPSHOT
 kotlin.mpp.import.enableKgpDependencyResolution=true
 kotlin.native.ignoreDisabledTargets=true
 kotlin.native.ignoreIncorrectDependencies=true
+kotlin.js.yarn=false
 kotlinx.atomicfu.enableJvmIrTransformation=true
 kotlinx.atomicfu.enableJsIrTransformation=true
 kotlinx.atomicfu.enableNativeIrTransformation=true
 #Gradle
-org.gradle.jvmargs=-Xmx2g
+org.gradle.jvmargs=-Xmx4g
 org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.configuration-cache=true