Update Gradle Distribution url, added CI checks for yarn and npm distros

Mr3zee · Mr3zee · commit 73ec3a651c90 · 2024-10-30T14:08:53.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,7 +3,7 @@
  */
 
 import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
-import util.kotlinVersionParsed
+import util.getSpacePassword
 import util.libs
 
 plugins {
@@ -64,34 +64,38 @@ val executeNpmLogin by tasks.registering {
 
     // To prevent leaking of credentials in VCS on dev machine use the build directory config file
     val buildYarnConfigFile = File(project.rootDir, "build/js/.yarnrc")
-    val buildYarnYmlConfigFile = File(project.rootDir, "build/js/.yarnrc.yml")
+    val buildNpmConfigFile = File(project.rootDir, "build/js/.npmrc")
 
-    val spaceUsername: String? = getSpaceUsername()
     val spacePassword: String? = getSpacePassword()
 
     doLast {
-        if (spaceUsername == null || spacePassword == null) {
-            return@doLast
-        }
-
-        if (spacePassword.split(".").size != 3) {
-            error("Unexpected Space Token format")
-        }
+        val outputYarnText = """
+            registry: "$registryUrl"
+        """.trimIndent()
 
-        val outputYarnYmlText = """       
-            npmRegistryServer: "$registryUrl"
-            npmAlwaysAuth: true
-            npmAuthToken: "$spacePassword"
+        var outputNpmText = """
+            registry: "$registryUrl"
         """.trimIndent()
 
+        if (spacePassword != null) {
+            if (spacePassword.split(".").size != 3) {
+                throw GradleException("Unexpected Space Token format")
+            }
+
+            outputNpmText += System.lineSeparator() + """
+                always-auth: true
+                ${registryUrl.removePrefix("https:")}:_authToken=$spacePassword
+            """.trimIndent()
+        }
+
         buildYarnConfigFile.createNewFile()
-        buildYarnConfigFile.writeText("registry: $registryUrl")
-        buildYarnYmlConfigFile.createNewFile()
-        buildYarnYmlConfigFile.writeText(outputYarnYmlText)
+        buildYarnConfigFile.writeText(outputYarnText)
+        buildNpmConfigFile.createNewFile()
+        buildNpmConfigFile.writeText(outputNpmText)
     }
 
     outputs.file(buildYarnConfigFile).withPropertyName("buildOutputYarnFile")
-    outputs.file(buildYarnYmlConfigFile).withPropertyName("buildOutputYarnYmlFile")
+    outputs.file(buildNpmConfigFile).withPropertyName("buildOutputNpmFile")
 }
 
 plugins.withType(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin::class.java).configureEach {
diff --git a/gradle-conventions-settings/develocity/build.gradle.kts b/gradle-conventions-settings/develocity/build.gradle.kts
@@ -15,11 +15,6 @@ configurations.configureEach {
     }
 }
 
-repositories {
-    mavenCentral()
-    gradlePluginPortal()
-}
-
 dependencies {
     implementation("com.gradle:develocity-gradle-plugin:3.17")
     implementation("com.gradle:common-custom-user-data-gradle-plugin:2.0.2")
diff --git a/gradle-conventions-settings/src/main/kotlin/conventions-repositories.settings.gradle.kts b/gradle-conventions-settings/src/main/kotlin/conventions-repositories.settings.gradle.kts
@@ -2,9 +2,7 @@
  * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
-@file:Suppress("DuplicatedCode", "MISSING_DEPENDENCY_CLASS")
-
-import java.util.*
+@file:Suppress("DuplicatedCode")
 
 pluginManagement {
     fun logAbsentProperty(name: String): Nothing? {
@@ -13,36 +11,16 @@ pluginManagement {
         return null
     }
 
-    @Suppress("RemoveRedundantQualifierName")
-    fun getLocalProperties(): java.util.Properties {
-        return java.util.Properties().apply {
-            val propertiesDir = File(
-                rootDir.path
-                    .removeSuffix("/gradle-conventions")
-                    .removeSuffix("/gradle-conventions-settings")
-                    .removeSuffix("/ksp-plugin")
-                    .removeSuffix("/compiler-plugin")
-                    .removeSuffix("/gradle-plugin")
-            )
-            val localFile = File(propertiesDir, "local.properties")
-            if (localFile.exists()) {
-                localFile.inputStream().use { load(it) }
-            }
-        }
-    }
-
     fun getSpaceUsername(): String? {
         val username = "kotlinx.rpc.team.space.username"
-        return getLocalProperties()[username] as String?
-            ?: settings.providers.gradleProperty(username).orNull
+        return settings.providers.gradleProperty(username).orNull
             ?: System.getenv(username)?.ifEmpty { null }
             ?: logAbsentProperty(username)
     }
 
     fun getSpacePassword(): String? {
         val password = "kotlinx.rpc.team.space.password"
-        return getLocalProperties()[password] as String?
-            ?: settings.providers.gradleProperty(password).orNull
+        return settings.providers.gradleProperty(password).orNull
             ?: System.getenv(password)?.ifEmpty { null }
             ?: logAbsentProperty(password)
     }
@@ -56,9 +34,15 @@ pluginManagement {
         maven {
             name = repoName.split("-").joinToString("") { it.replaceFirstChar { c -> c.titlecase() } }
             url = uri("https://packages.jetbrains.team/maven/p/krpc/$repoName")
-            credentials {
-                username = getSpaceUsername()
-                password = getSpacePassword()
+
+            val spaceUsername = getSpaceUsername()
+            val spacePassword = getSpacePassword()
+
+            if (spaceUsername != null && spacePassword != null) {
+                credentials {
+                    username = spaceUsername
+                    password = spacePassword
+                }
             }
         }
     }
@@ -79,35 +63,16 @@ gradle.rootProject {
         return null
     }
 
-    fun getLocalProperties(): Properties {
-        return Properties().apply {
-            val propertiesDir = File(
-                rootDir.path
-                    .removeSuffix("/gradle-conventions")
-                    .removeSuffix("/gradle-conventions-settings")
-                    .removeSuffix("/ksp-plugin")
-                    .removeSuffix("/compiler-plugin")
-                    .removeSuffix("/gradle-plugin")
-            )
-            val localFile = File(propertiesDir, "local.properties")
-            if (localFile.exists()) {
-                localFile.inputStream().use { load(it) }
-            }
-        }
-    }
-
     fun getSpaceUsername(): String? {
         val username = "kotlinx.rpc.team.space.username"
-        return getLocalProperties()[username] as String?
-            ?: settings.providers.gradleProperty(username).orNull
+        return settings.providers.gradleProperty(username).orNull
             ?: System.getenv(username)?.ifEmpty { null }
             ?: logAbsentProperty(username)
     }
 
     fun getSpacePassword(): String? {
         val password = "kotlinx.rpc.team.space.password"
-        return getLocalProperties()[password] as String?
-            ?: settings.providers.gradleProperty(password).orNull
+        return settings.providers.gradleProperty(password).orNull
             ?: System.getenv(password)?.ifEmpty { null }
             ?: logAbsentProperty(password)
     }
@@ -122,9 +87,15 @@ gradle.rootProject {
             name = repoName.split("-").joinToString("") { it.replaceFirstChar { c -> c.titlecase() } }
 
             url = uri("https://packages.jetbrains.team/maven/p/krpc/$repoName")
-            credentials {
-                username = getSpaceUsername()
-                password = getSpacePassword()
+
+            val spaceUsername = getSpaceUsername()
+            val spacePassword = getSpacePassword()
+
+            if (spaceUsername != null && spacePassword != null) {
+                credentials {
+                    username = spaceUsername
+                    password = spacePassword
+                }
             }
         }
     }
diff --git a/gradle-conventions-settings/src/main/kotlin/util/properties.kt b/gradle-conventions-settings/src/main/kotlin/util/properties.kt
@@ -7,43 +7,25 @@
 package util
 
 import org.gradle.api.Project
-import java.io.File
 
 fun Project.logAbsentProperty(name: String): Nothing? {
     logger.info("Property '$name' is not present.")
 
     return null
 }
 
-fun Project.getLocalProperties(): java.util.Properties {
-    return java.util.Properties().apply {
-        val propertiesDir = File(
-            rootDir.path
-                .removeSuffix("/gradle-conventions")
-                .removeSuffix("/gradle-conventions-settings")
-                .removeSuffix("/ksp-plugin")
-                .removeSuffix("/compiler-plugin")
-                .removeSuffix("/gradle-plugin")
-        )
-        val localFile = File(propertiesDir, "local.properties")
-        if (localFile.exists()) {
-            localFile.inputStream().use { load(it) }
-        }
-    }
-}
+private const val SPACE_USERNAME = "kotlinx.rpc.team.space.username"
 
 fun Project.getSpaceUsername(): String? {
-    val username = "kotlinx.rpc.team.space.username"
-    return getLocalProperties()[username] as String?
-        ?: providers.gradleProperty(username).orNull
-        ?: System.getenv(username)?.ifEmpty { null }
-        ?: logAbsentProperty(username)
+    return providers.gradleProperty(SPACE_USERNAME).orNull
+        ?: System.getenv(SPACE_USERNAME)?.ifEmpty { null }
+        ?: logAbsentProperty(SPACE_USERNAME)
 }
 
+private const val SPACE_PASSWORD = "kotlinx.rpc.team.space.password"
+
 fun Project.getSpacePassword(): String? {
-    val password = "kotlinx.rpc.team.space.password"
-    return getLocalProperties()[password] as String?
-        ?: providers.gradleProperty(password).orNull
-        ?: System.getenv(password)?.ifEmpty { null }
-        ?: logAbsentProperty(password)
+    return providers.gradleProperty(SPACE_PASSWORD).orNull
+        ?: System.getenv(SPACE_PASSWORD)?.ifEmpty { null }
+        ?: logAbsentProperty(SPACE_USERNAME)
 }
diff --git a/gradle-conventions/src/main/kotlin/compiler-specific-module.gradle.kts b/gradle-conventions/src/main/kotlin/compiler-specific-module.gradle.kts
@@ -35,7 +35,7 @@ fun NamedDomainObjectContainer<KotlinSourceSet>.applyCompilerSpecificSourceSets(
 
         logger.lifecycle(
             "${project.name}: included version specific source sets: " +
-                    "${core.name}${mostSpecificApplicable?.let { ", $name" } ?: ""}"
+                    "[${core.name}${mostSpecificApplicable?.let { ", $name" } ?: ""}]"
         )
 
         val newSourceDirectories = listOfNotNull(core, mostSpecificApplicable)
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -4,6 +4,6 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://packages.jetbrains.team/files/p/krpc/build-deps/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/krpc/krpc-test/build.gradle.kts b/krpc/krpc-test/build.gradle.kts
@@ -18,6 +18,14 @@ applyAtomicfuPlugin()
 
 kotlin {
     sourceSets {
+        commonMain {
+            dependencies {
+                // Workaround for
+                // KLIB resolver: Could not find "org.jetbrains.kotlinx:atomicfu"
+                api(libs.atomicfu)
+            }
+        }
+
         jvmMain {
             dependencies {
                 api(projects.krpc.krpcCore)
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -11,6 +11,8 @@ pluginManagement {
 
     includeBuild("gradle-plugin")
 
+    apply(from = "gradle-conventions-settings/src/main/kotlin/conventions-repositories.settings.gradle.kts")
+
     resolutionStrategy {
         eachPlugin {
             if (requested.id.id == "kotlinx-atomicfu") {
diff --git a/versions-root/libs.versions.toml b/versions-root/libs.versions.toml
@@ -96,6 +96,7 @@ kotlin-js-wrappers = { module = "org.jetbrains.kotlin-wrappers:kotlin-js", versi
 gradle-kotlin-dsl-pluigns = { module = "org.gradle.kotlin:gradle-kotlin-dsl-plugins", version.ref = "gradle-kotlin-dsl" }
 intellij-util = { module = "com.jetbrains.intellij.platform:util", version.ref = "intellij" }
 gradle-doctor-plugin = { module = "com.osacky.doctor:doctor-plugin", version.ref = "gradle-doctor" }
+atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version.ref = "atomicfu" }
 
 [plugins]
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin-lang" }

Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,6 @@ configurations.configureEach {`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`
`18`		`-repositories {`
`19`		`- mavenCentral()`
`20`		`- gradlePluginPortal()`
`21`		`-}`
`22`		`-`
`23`	`18`	`dependencies {`
`24`	`19`	`implementation("com.gradle:develocity-gradle-plugin:3.17")`
`25`	`20`	`implementation("com.gradle:common-custom-user-data-gradle-plugin:2.0.2")`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ fun NamedDomainObjectContainer<KotlinSourceSet>.applyCompilerSpecificSourceSets(`
`35`	`35`
`36`	`36`	`logger.lifecycle(`
`37`	`37`	`"${project.name}: included version specific source sets: " +`
`38`		`- "${core.name}${mostSpecificApplicable?.let { ", $name" } ?: ""}"`
	`38`	`+ "[${core.name}${mostSpecificApplicable?.let { ", $name" } ?: ""}]"`
`39`	`39`	`)`
`40`	`40`
`41`	`41`	`val newSourceDirectories = listOfNotNull(core, mostSpecificApplicable)`