Fix deprecation warnings and enable warningsAsErrors for buildSrc (#4464)

K/JS related deprecation warnings are to be promoted to error within KT-68597 in Kotlin 2.2

Author: ALikhachev

buildSrc/build.gradle.kts

@@ -38,6 +38,12 @@ fun version(target: String): String {
     return properties[version]?.let{"$it"} ?: gradleProperties.getProperty(version)
 }
 
+kotlin {
+    compilerOptions {
+        allWarningsAsErrors = true
+    }
+}
+
 dependencies {
     implementation(kotlin("gradle-plugin", version("kotlin")))
     /*

buildSrc/src/main/kotlin/AuxBuildConfiguration.kt

@@ -1,6 +1,4 @@
-import CacheRedirector.configure
-import org.gradle.api.Project
-import org.gradle.api.tasks.*
+import org.gradle.api.*
 import org.gradle.kotlin.dsl.*
 
 /**
@@ -17,7 +15,7 @@ object AuxBuildConfiguration {
             workaroundForCoroutinesLeakageToClassPath()
         }
 
-        CacheRedirector.configureJsPackageManagers(rootProject)
+        CacheRedirector.configureRootJsPackageManagers(rootProject)
 
         // Sigh, there is no BuildScanExtension in classpath when there is no --scan
         rootProject.extensions.findByName("buildScan")?.withGroovyBuilder {

buildSrc/src/main/kotlin/CacheRedirector.kt

@@ -1,10 +1,10 @@
+
 import org.gradle.api.*
 import org.gradle.api.artifacts.dsl.*
 import org.gradle.api.artifacts.repositories.*
 import org.gradle.api.initialization.dsl.*
 import org.gradle.kotlin.dsl.*
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.*
-import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.*
 import org.jetbrains.kotlin.gradle.targets.js.yarn.*
 import java.net.*
 
@@ -100,16 +100,28 @@ private fun Project.checkRedirect(repositories: RepositoryHandler, containerName
     }
 }
 
-private fun Project.configureYarnAndNodeRedirects() {
+private fun Project.configureYarnRedirects() {
     if (CacheRedirector.isEnabled) {
-        val yarnRootExtension = extensions.findByType<YarnRootExtension>()
-        yarnRootExtension?.downloadBaseUrl?.let {
-            yarnRootExtension.downloadBaseUrl = CacheRedirector.maybeRedirect(it)
+        plugins.withType(YarnPlugin::class) {
+            extensions.configure(YarnRootEnvSpec::class.java) {
+                // no API to modify the value in-place keeping it lazy: https://github.com/gradle/gradle/issues/27227
+                downloadBaseUrl.orNull?.let {
+                    downloadBaseUrl = CacheRedirector.maybeRedirect(it)
+                }
+            }
         }
+    }
+}
 
-        val nodeJsExtension = rootProject.extensions.findByType<NodeJsRootExtension>()
-        nodeJsExtension?.downloadBaseUrl?.let {
-            nodeJsExtension.downloadBaseUrl = CacheRedirector.maybeRedirect(it)
+private fun Project.configureNodeJsRedirects() {
+    if (CacheRedirector.isEnabled) {
+        plugins.withType(NodeJsPlugin::class) {
+            extensions.configure(NodeJsEnvSpec::class.java) {
+                // no API to modify the value in-place keeping it lazy: https://github.com/gradle/gradle/issues/27227
+                downloadBaseUrl.orNull?.let {
+                    downloadBaseUrl = CacheRedirector.maybeRedirect(it)
+                }
+            }
         }
     }
 }
@@ -128,14 +140,16 @@ object CacheRedirector {
     @JvmStatic
     fun configure(project: Project) {
         project.checkRedirect(project.repositories, project.displayName)
+        project.configureNodeJsRedirects()
     }
 
     /**
-     * Configures JS-specific extensions to use
+     * Configures JS-specific extensions defined on the root project to use cache redirector
+     * For example, KGP provides Yarn configuration only globally for the entire build via the root project.
      */
     @JvmStatic
-    fun configureJsPackageManagers(project: Project) {
-        project.configureYarnAndNodeRedirects()
+    fun configureRootJsPackageManagers(rootProject: Project) {
+        rootProject.configureYarnRedirects()
     }
 
     @JvmStatic

buildSrc/src/main/kotlin/CommunityProjectsBuild.kt

@@ -2,12 +2,11 @@
 
 import org.gradle.api.*
 import org.gradle.api.artifacts.dsl.*
-import org.gradle.api.tasks.testing.Test
+import org.gradle.api.tasks.testing.*
 import org.gradle.kotlin.dsl.*
-import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions
+import org.jetbrains.kotlin.gradle.dsl.*
 import java.net.*
 import java.util.logging.*
-import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 
 private val LOGGER: Logger = Logger.getLogger("Kotlin settings logger")
 
@@ -107,7 +106,7 @@ fun Project.configureCommunityBuildTweaks() {
     val coreProject = subprojects.single { it.name == coreModule }
     configure(listOf(coreProject)) {
         configurations.matching { it.name == "kotlinCompilerClasspath" }.configureEach {
-            val config = resolvedConfiguration.files.single { it.name.contains("kotlin-compiler-embeddable") }
+            val config = incoming.files.single { it.name.contains("kotlin-compiler-embeddable") }
 
             val manifest = zipTree(config).matching {
                 include("META-INF/MANIFEST.MF")

buildSrc/src/main/kotlin/kotlin-multiplatform-conventions.gradle.kts

@@ -1,4 +1,3 @@
-import org.gradle.api.*
 import org.gradle.api.tasks.testing.logging.*
 import org.jetbrains.kotlin.gradle.dsl.*
 
@@ -47,7 +46,7 @@ kotlin {
         watchosDeviceArm64()
     }
     js {
-        moduleName = project.name
+        outputModuleName = project.name
         nodejs()
         compilations["main"]?.dependencies {
             api("org.jetbrains.kotlinx:atomicfu-js:${version("atomicfu")}")
@@ -57,7 +56,7 @@ kotlin {
     wasmJs {
         // Module name should be different from the one from JS
         // otherwise IC tasks that start clashing different modules with the same module name
-        moduleName = project.name + "Wasm"
+        outputModuleName = project.name + "Wasm"
         nodejs()
         compilations["main"]?.dependencies {
             api("org.jetbrains.kotlinx:atomicfu-wasm-js:${version("atomicfu")}")