WIP updating to Kotlin 1.9.22

Author: RBusarow

.github/workflows/ci.yml

@@ -243,11 +243,17 @@ jobs:
       fail-fast: false
       ### <start-versions-matrix>
       matrix:
-        kotlin-version: [ 1.8.0, 1.8.10, 1.8.22 ]
-        gradle-version: [ 8.0.2, 8.1.1, 8.4, 8.5 ]
+        kotlin-version: [ 1.8.22, 1.9.10, 1.9.22 ]
+        gradle-version: [ 8.5 ]
         agp-version: [ 8.0.2, 8.1.0 ]
-        anvil-version: [ 2.4.6 ]
-        exclude: [ ]
+        anvil-version: [ 2.4.9-1-8, 2.4.9 ]
+        exclude:
+          - kotlin-version: 1.9.10
+            anvil-version: 2.4.9-1-8
+          - kotlin-version: 1.9.22
+            anvil-version: 2.4.9-1-8
+          - kotlin-version: 1.8.22
+            anvil-version: 2.4.9
       ### <end-versions-matrix>
     runs-on: ubuntu-latest
     steps:

build-logic/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 Rick Busarow
+ * Copyright (C) 2021-2024 Rick Busarow
  * 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
@@ -30,7 +30,6 @@ moduleCheck {
   }
 }
 
-val kotlinVersion = libs.versions.kotlin.get()
 val ktlintPluginId = libs.plugins.ktlint.get().pluginId
 
 allprojects ap@{

build-logic/versions-matrix/build.gradle.kts

@@ -13,15 +13,6 @@
  * limitations under the License.
  */
 
-buildscript {
-  dependencies {
-    // Gradle 7.6 has a dependency resolution bug which tries to use Kotlin 1.7.10
-    // for transitive dependencies like `sam-with-receiver`.
-    // https://github.com/gradle/gradle/issues/22510
-    classpath(libs.kotlin.sam.with.receiver)
-  }
-}
-
 plugins {
   base
   kotlin("jvm")
@@ -63,8 +54,6 @@ dependencies {
   implementation(libs.kotlin.stdlib.jdk7)
   implementation(libs.kotlin.stdlib.jdk8)
   implementation(libs.kotlinx.knit)
-  implementation(libs.rickBusarow.kase)
-  implementation(libs.rickBusarow.kase.gradle)
   implementation(libs.rickBusarow.ktlint)
   implementation(libs.scabbard)
   implementation(libs.square.anvil.gradle)

build-logic/versions-matrix/src/main/kotlin/modulecheck/builds/matrix/VersionsMatrix.kt

@@ -16,31 +16,17 @@
 package modulecheck.builds.matrix
 
 class VersionsMatrix(
-  val exhaustive: Boolean = false,
-  private val gradleArg: String? = null,
-  private val agpArg: String? = null,
-  private val anvilArg: String? = null,
-  private val kotlinArg: String? = null
+  val gradleList: List<String>,
+  val agpList: List<String>,
+  val anvilList: List<String>,
+  val kotlinList: List<String>
 ) {
 
-  internal val gradleListDefault = listOf("8.0.2", "8.1.1", "8.4", "8.5")
-  internal val agpListDefault = listOf("8.0.2", "8.1.0")
-  internal val anvilListDefault = listOf("2.4.6")
-  internal val kotlinListDefault = listOf("1.8.0", "1.8.10", "1.8.22")
-
-  val gradleList = gradleArg?.singletonList() ?: gradleListDefault
-  val agpList = agpArg?.singletonList() ?: agpListDefault
-  val anvilList = anvilArg?.singletonList() ?: anvilListDefault
-  val kotlinList = kotlinArg?.singletonList() ?: kotlinListDefault
-
-  internal val exclusions = listOf<Exclusion>().requireNoDuplicates()
-
-  private val latest by lazy { allValid.last() }
-
-  val defaultGradle by lazy { gradleArg ?: latest.gradle }
-  val defaultAgp by lazy { agpArg ?: latest.agp }
-  val defaultAnvil by lazy { anvilArg ?: latest.anvil }
-  val defaultKotlin by lazy { kotlinArg ?: latest.kotlin }
+  internal val exclusions = listOf(
+    Exclusion(anvil = "2.4.9-1-8", kotlin = "1.9.10"),
+    Exclusion(anvil = "2.4.9-1-8", kotlin = "1.9.22"),
+    Exclusion(anvil = "2.4.9", kotlin = "1.8.22")
+  ).requireNoDuplicates()
 
   // ORDER MATTERS.
   // ...at least with regard to Gradle.
@@ -68,37 +54,21 @@ class VersionsMatrix(
     }
   }
 
-  val allValidDefaults = combinations(
-    gradleList = gradleListDefault,
-    agpList = agpListDefault,
-    anvilList = anvilListDefault,
-    kotlinList = kotlinListDefault
-  ).filtered(exclusions).requireNotEmpty()
-
   val allValid = combinations(
     gradleList = gradleList,
     agpList = agpList,
     anvilList = anvilList,
     kotlinList = kotlinList
-  ).filtered(exclusions).requireNotEmpty()
+  ).filtered(exclusions)
+    .requireNotEmpty()
 
   init {
-
     requireNoUselessExclusions()
   }
 
   private fun List<TestVersions>.requireNotEmpty() = apply {
     require(isNotEmpty()) {
-      val arguments = listOf(
-        "gradle" to gradleArg,
-        "agp" to agpArg,
-        "anvil" to anvilArg,
-        "kotlin" to kotlinArg
-      ).filter { pair -> pair.second != null }
-        .map { (name, version) -> "$name=$version" }
-
-      "There are no valid version combinations to be made " +
-        "from the provided arguments: $arguments"
+      "There are no valid version combinations to be made from the provided arguments."
     }
   }
 
@@ -117,7 +87,7 @@ class VersionsMatrix(
   private fun requireNoUselessExclusions() {
     // If we're using arguments, then the baseline `combinations` list will naturally be smaller.
     // This check can be skipped.
-    if (listOfNotNull(gradleArg, agpArg, anvilArg, kotlinArg).isNotEmpty()) return
+    // if (listOfNotNull(gradleArg, agpArg, anvilArg, kotlinArg).isNotEmpty()) return
 
     val redundant = mutableListOf<Exclusion>()
 
@@ -143,8 +113,6 @@ class VersionsMatrix(
     }
   }
 
-  private fun <T> T.singletonList() = listOf(this)
-
   internal operator fun Collection<Exclusion>.contains(testVersions: TestVersions): Boolean {
     return any { testVersions.excludedBy(it) }
   }

build-logic/versions-matrix/src/main/kotlin/modulecheck/builds/matrix/VersionsMatrixExtension.kt

@@ -21,6 +21,10 @@ import com.rickbusarow.kgx.listProperty
 import com.rickbusarow.kgx.pluginId
 import com.rickbusarow.kgx.propertyOrNull
 import com.rickbusarow.kgx.version
+import modulecheck.builds.matrix.Versions.Companion.agpListDefault
+import modulecheck.builds.matrix.Versions.Companion.anvilListDefault
+import modulecheck.builds.matrix.Versions.Companion.gradleListDefault
+import modulecheck.builds.matrix.Versions.Companion.kotlinListDefault
 import org.gradle.api.Project
 import org.gradle.api.provider.ListProperty
 import org.gradle.kotlin.dsl.buildConfigField
@@ -35,16 +39,19 @@ open class Versions @Inject constructor(
 
   val gradleList: ListProperty<String> = target.objects
     .listProperty<String>()
-    .convention(propertyName = "modulecheck.gradleVersion", listOf("8.0.2", "8.1.1", "8.4", "8.5"))
+    .convention(propertyName = "modulecheck.gradleVersion", gradleListDefault)
+
   val agpList: ListProperty<String> = target.objects
     .listProperty<String>()
-    .convention("modulecheck.agpVersion", listOf("8.0.2", "8.1.0"))
+    .convention("modulecheck.agpVersion", agpListDefault)
+
   val anvilList: ListProperty<String> = target.objects
     .listProperty<String>()
-    .convention("modulecheck.anvilVersion", listOf("2.4.6"))
+    .convention("modulecheck.anvilVersion", anvilListDefault)
+
   val kotlinList: ListProperty<String> = target.objects
     .listProperty<String>()
-    .convention("modulecheck.kotlinVersion", listOf("1.8.0", "1.8.10", "1.8.22"))
+    .convention("modulecheck.kotlinVersion", kotlinListDefault)
 
   private fun ListProperty<String>.convention(
     propertyName: String,
@@ -54,6 +61,13 @@ open class Versions @Inject constructor(
       .map { it.split("""\s*,\s*""".toRegex()) }
       .orElse(default)
   )
+
+  companion object {
+    internal val gradleListDefault = listOf("8.5")
+    internal val agpListDefault = listOf("8.0.2", "8.1.0")
+    internal val anvilListDefault = listOf("2.4.9-1-8", "2.4.9")
+    internal val kotlinListDefault = listOf("1.8.22", "1.9.10", "1.9.22")
+  }
 }
 
 open class VersionsMatrixExtension @Inject constructor(target: Project) : Serializable {
@@ -121,12 +135,17 @@ private fun Project.requireInSyncWithToml() {
     "Could not resolve the $simpleName file: $versionMatrixFile"
   }
 
-  with(VersionsMatrix()) {
+  VersionsMatrix(
+    gradleList = gradleListDefault,
+    agpList = agpListDefault,
+    anvilList = anvilListDefault,
+    kotlinList = kotlinListDefault
+  ).run {
 
     sequenceOf(
       Triple(agpList, "agpList", "androidTools"),
       Triple(anvilList, "anvilList", "square-anvil"),
-      Triple(kotlinList, "kotlinList", "kotlin")
+      Triple(kotlinList, "kotlinList", "kotlin-core")
     )
       .forEach { (list, listName, alias) ->
         require(list.contains(libsCatalog.version(alias))) {

build-logic/versions-matrix/src/main/kotlin/modulecheck/builds/matrix/VersionsMatrixYamlCheckTask.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 Rick Busarow
+ * Copyright (C) 2021-2024 Rick Busarow
  * 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
@@ -101,11 +101,10 @@ abstract class VersionsMatrixYamlGenerateTask @Inject constructor(
 
 private fun createYaml(indentSize: Int): String {
   val versionsMatrix = VersionsMatrix(
-    exhaustive = true,
-    gradleArg = null,
-    agpArg = null,
-    anvilArg = null,
-    kotlinArg = null
+    gradleList = Versions.gradleListDefault,
+    agpList = Versions.agpListDefault,
+    anvilList = Versions.anvilListDefault,
+    kotlinList = Versions.kotlinListDefault
   )
 
   return VersionsMatrixYamlGenerator()

gradle/libs.versions.toml

@@ -5,9 +5,10 @@ jdk = "17"
 jvmTarget = "11"
 kotlinApi = "1.6"
 
-kotlin = "1.8.22"
-google-ksp = "1.8.22-1.0.11"
-square-anvil = "2.4.6"
+kotlin-gradle = "1.9.22"
+kotlin-core = "1.9.22"
+google-ksp = "1.9.22-1.0.16"
+square-anvil = "2.4.9"
 
 ajalt-clikt = "4.2.2"
 ajalt-mordant = "2.1.0"
@@ -101,9 +102,9 @@ exhaustive = { id = "app.cash.exhaustive:exhaustive-gradle", version.ref = "exha
 github-release = { id = "com.github.breadmoirai.github-release", version.ref = "github-release" }
 google-ksp = { id = "com.google.devtools.ksp", version.ref = "google-ksp" }
 gradle-plugin-publish = { id = "com.gradle.plugin-publish", version.ref = "gradle-plugin-publish" }
-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin-gradle" }
 kotlinx-binaryCompatibility = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "kotlinx-binaryCompatibility" }
-kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin-core" }
 ktlint = { id = "com.rickbusarow.ktlint", version.ref = "rickBusarow-ktlint" }
 moduleCheck = { id = "com.rickbusarow.module-check", version.ref = "rickBusarow-moduleCheck" }
 shadow = { id = "com.github.johnrengelman.shadow", version.ref = "johnrengelman-shadow" }
@@ -206,17 +207,18 @@ kotest-extensions = { module = "io.kotest:kotest-extensions", version.ref = "kot
 kotest-property-jvm = { module = "io.kotest:kotest-property-jvm", version.ref = "kotest" }
 kotest-runner-junit5-jvm = { module = "io.kotest:kotest-runner-junit5-jvm", version.ref = "kotest" }
 
-kotlin-annotation-processing = { module = "org.jetbrains.kotlin:kotlin-annotation-processing-embeddable", version.ref = "kotlin" }
-kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" }
-kotlin-compiler = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" }
-kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
-kotlin-gradle-plugin-api = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin-api", version.ref = "kotlin" }
-kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
-kotlin-sam-with-receiver = { module = "org.jetbrains.kotlin:kotlin-sam-with-receiver", version.ref = "kotlin" }
-kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" }
-kotlin-stdlib-jdk7 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk7", version.ref = "kotlin" }
-kotlin-stdlib-common = { module = "org.jetbrains.kotlin:kotlin-stdlib-common", version.ref = "kotlin" }
-kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
+kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin-gradle" }
+kotlin-gradle-plugin-api = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin-api", version.ref = "kotlin-gradle" }
+
+kotlin-annotation-processing = { module = "org.jetbrains.kotlin:kotlin-annotation-processing-embeddable", version.ref = "kotlin-core" }
+kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin-core" }
+kotlin-compiler = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin-core" }
+kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin-core" }
+kotlin-sam-with-receiver = { module = "org.jetbrains.kotlin:kotlin-sam-with-receiver", version.ref = "kotlin-core" }
+kotlin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin-core" }
+kotlin-stdlib-jdk7 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk7", version.ref = "kotlin-core" }
+kotlin-stdlib-common = { module = "org.jetbrains.kotlin:kotlin-stdlib-common", version.ref = "kotlin-core" }
+kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin-core" }
 
 kotlinx-binaryCompatibility = { module = "org.jetbrains.kotlinx:binary-compatibility-validator", version.ref = "kotlinx-binaryCompatibility" }