update to Kotlin 2.0.21 and friends

Author: RBusarow

.github/workflows/ci.yml

@@ -93,27 +93,27 @@ jobs:
         uses: rickbusarow/actions/gradle-task-with-commit@bf0940965387f10bcb8b6699a79499d18167dfbe # v1
         with:
           personal-access-token: ${{ steps.app-token.outputs.token }}
-          fix-task: dependencyGuardBaseline
-          check-task: dependencyGuard
-
-  moduleCheck:
-    runs-on: ubuntu-latest
-    needs: build-all
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - name: Create GitHub App Token
-        uses: actions/create-github-app-token@136412a57a7081aa63c935a2cc2918f76c34f514 # v1
-        id: app-token
-        with:
-          app-id: ${{ secrets.PR_BOT_APP_ID }}
-          private-key: ${{ secrets.PR_BOT_PRIVATE_KEY }}
-
-      - name: moduleCheck
-        uses: rickbusarow/actions/gradle-task-with-commit@bf0940965387f10bcb8b6699a79499d18167dfbe # v1
-        with:
-          personal-access-token: ${{ steps.app-token.outputs.token }}
-          fix-task: moduleCheckAuto
-          check-task: moduleCheck
+          fix-task: dependencyGuardBaseline --no-parallel
+          check-task: dependencyGuard --no-parallel
+
+#  moduleCheck:
+#    runs-on: ubuntu-latest
+#    needs: build-all
+#    steps:
+#      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+#      - name: Create GitHub App Token
+#        uses: actions/create-github-app-token@136412a57a7081aa63c935a2cc2918f76c34f514 # v1
+#        id: app-token
+#        with:
+#          app-id: ${{ secrets.PR_BOT_APP_ID }}
+#          private-key: ${{ secrets.PR_BOT_PRIVATE_KEY }}
+#
+#      - name: moduleCheck
+#        uses: rickbusarow/actions/gradle-task-with-commit@bf0940965387f10bcb8b6699a79499d18167dfbe # v1
+#        with:
+#          personal-access-token: ${{ steps.app-token.outputs.token }}
+#          fix-task: moduleCheckAuto
+#          check-task: moduleCheck
 
   doks:
     runs-on: ubuntu-latest
@@ -292,11 +292,13 @@ jobs:
       fail-fast: false
       ### <start-versions-matrix>
       matrix:
-        kotlin-version: [ 1.9.22 ]
-        gradle-version: [ 8.5, 8.6 ]
+        kotlin-version: [ 2.0.21 ]
+        gradle-version: [ 8.5, 8.12.1 ]
         agp-version: [ 8.0.2, 8.1.0 ]
-        anvil-version: [ 2.4.9 ]
-        exclude: [ ]
+        anvil-version: [ 2.5.0, 2.5.1 ]
+        exclude:
+          - kotlin-version: 2.0.21
+            anvil-version: 2.5.0
       ### <end-versions-matrix>
     runs-on: ubuntu-latest
     steps:
@@ -367,7 +369,7 @@ jobs:
       - integration-tests-ubuntu
       - integration-tests-windows
       - ktlint
-      - moduleCheck
+#      - moduleCheck
       - unit-tests
       - validate-wrapper
       - website-versioning

.gitignore

@@ -67,3 +67,5 @@ java_pid1690.hprof
 build-logic/.editorconfig
 
 **/node_modules/
+
+.kotlin/

.idea/ktlint-plugin.xml

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2024 Rick Busarow
+ * Copyright (C) 2021-2025 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
@@ -13,7 +13,9 @@
  * limitations under the License.
  */
 
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
 import org.jetbrains.kotlin.gradle.plugin.KotlinBasePlugin
 
 plugins {
@@ -55,27 +57,24 @@ allprojects ap@{
       jvmToolchain {
         languageVersion.set(JavaLanguageVersion.of(libs.versions.jdk.get()))
       }
+      compilerOptions {
+        val versionProvider = libs.versions.kotlinApi
+          .map { KotlinVersion.fromVersion(it) }
+
+        languageVersion.set(versionProvider)
+        apiVersion.set(versionProvider)
+
+        jvmTarget = libs.versions.jvmTarget.map { JvmTarget.fromTarget(it) }
+
+        optIn.add("kotlin.RequiresOptIn")
+      }
     }
   }
   plugins.withType(JavaPlugin::class.java).configureEach {
     extensions.configure(JavaPluginExtension::class.java) {
       sourceCompatibility = JavaVersion.toVersion(libs.versions.jvmTarget.get())
     }
   }
-
-  tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions {
-
-      languageVersion = "1.6"
-      apiVersion = "1.6"
-
-      jvmTarget = libs.versions.jvmTarget.get()
-
-      freeCompilerArgs = freeCompilerArgs + listOf(
-        "-opt-in=kotlin.RequiresOptIn"
-      )
-    }
-  }
 }
 
 tasks.withType<Delete>().configureEach rootTask@{

build-logic/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2024 Rick Busarow
+ * Copyright (C) 2021-2025 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
@@ -22,7 +22,9 @@ class VersionsMatrix(
   val kotlinList: List<String>
 ) {
 
-  internal val exclusions = listOf<Exclusion>().requireNoDuplicates()
+  internal val exclusions = listOf<Exclusion>(
+    Exclusion(anvil = "2.5.0", kotlin = "2.0.21")
+  ).requireNoDuplicates()
 
   // ORDER MATTERS.
   // ...at least with regard to Gradle.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2024 Rick Busarow
+ * Copyright (C) 2021-2025 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
@@ -63,10 +63,10 @@ open class Versions @Inject constructor(
   )
 
   companion object {
-    internal val gradleListDefault = listOf("8.5", "8.6")
+    internal val gradleListDefault = listOf("8.5", "8.12.1")
     internal val agpListDefault = listOf("8.0.2", "8.1.0")
-    internal val anvilListDefault = listOf("2.4.9")
-    internal val kotlinListDefault = listOf("1.9.22")
+    internal val anvilListDefault = listOf("2.5.0", "2.5.1")
+    internal val kotlinListDefault = listOf("2.0.21")
   }
 }