Make the Kotlin nightly build use 2.2.0 (#6475)

Author: BoD

gradle/repositories.gradle.kts

@@ -1,7 +1,7 @@
 listOf(pluginManagement.repositories, dependencyResolutionManagement.repositories).forEach {
   it.apply {
     // Uncomment this one to use the Kotlin "dev" repository
-    // maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/")
+    // maven("https://redirector.kotlinlang.org/maven/dev/")
     // Uncomment this one to use the Sonatype OSSRH snapshots repository
     // maven("https://oss.sonatype.org/content/repositories/snapshots/")
     // Uncomment this one to use the GradleUp repository

intellij-plugin/build.gradle.kts

@@ -1,8 +1,8 @@
+
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 import org.jetbrains.changelog.markdownToHTML
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
-import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask.FailureLevel.COMPATIBILITY_PROBLEMS
 import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask.FailureLevel.INTERNAL_API_USAGES
 import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask.FailureLevel.INVALID_PLUGIN
 import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask.FailureLevel.PLUGIN_STRUCTURE_WARNINGS
@@ -28,9 +28,9 @@ commonSetup()
 // XXX: this should use the settings repositories instead
 repositories {
   // Uncomment this one to use the Kotlin "dev" repository
-  // maven { url = uri("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/") }
+  // maven("https://redirector.kotlinlang.org/maven/dev/")
   // Uncomment this one to use the Sonatype OSSRH snapshots repository
-  // maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots/") }
+  // maven("https://oss.sonatype.org/content/repositories/snapshots/")
   mavenCentral()
 
   intellijPlatform {

libraries/apollo-gradle-plugin/testProjects/gradle-min-version/build.gradle.kts

@@ -23,7 +23,7 @@ repositories {
   }
   mavenCentral()
   // Uncomment this one to use the Kotlin "dev" repository
-  // maven { url = uri("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/") }
+  // maven("https://redirector.kotlinlang.org/maven/dev/")
 }
 
 configure<ApolloExtension> {

scripts/bump-kotlin-nightlies.main.kts

@@ -1,5 +1,8 @@
 #!/usr/bin/env kotlin
 
+@file:DependsOn("com.github.zafarkhaja:java-semver:0.10.2")
+
+import com.github.zafarkhaja.semver.Version
 import java.io.File
 import java.net.URL
 import javax.xml.parsers.DocumentBuilderFactory
@@ -8,9 +11,18 @@ val BRANCH_NAME = "kotlin-nightlies"
 
 fun bumpVersions() {
   val kotlinVersion =
-    getLatestVersion("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/org/jetbrains/kotlin/kotlin-stdlib/maven-metadata.xml", prefix = "2.1")
-  val kspVersion =
-    getLatestVersion("https://oss.sonatype.org/content/repositories/snapshots/com/google/devtools/ksp/com.google.devtools.ksp.gradle.plugin/maven-metadata.xml")
+    getLatestVersion("https://redirector.kotlinlang.org/maven/dev/org/jetbrains/kotlin/kotlin-stdlib/maven-metadata.xml", prefix = "2.2.0")
+
+  val useKspSnapshots = false
+  val kspVersion = getLatestVersion(
+      if (useKspSnapshots) {
+        "https://oss.sonatype.org/content/repositories/snapshots/com/google/devtools/ksp/com.google.devtools.ksp.gradle.plugin/maven-metadata.xml"
+      } else {
+        "https://repo1.maven.org/maven2/com/google/devtools/ksp/com.google.devtools.ksp.gradle.plugin/maven-metadata.xml"
+      },
+      prefix = "2.2.0"
+  )
+
   File("gradle/libraries.toml").let { file ->
     file.writeText(
         file.readText()
@@ -40,7 +52,13 @@ fun getLatestVersion(url: String, prefix: String? = null): String {
           (0 until it.length)
               .map { i -> it.item(i).textContent }
               .filter { it.startsWith(prefix) }
-              .first() // Assumes they are sorted by most recent first, which is true on Kotlin's repo, false on Sonatype
+              .sortedBy {
+                Version.parse(
+                    // Make it SemVer comparable
+                    it.replace("-dev-", "-dev.")
+                )
+              }
+              .last()
         }
   } else {
     document