Update Kotlin and compiler plugins (#891)

* Update Kotlin and compiler plugins * update the KSP version logic in AnvilVersionMatrix * update DependencyGuard baselines for Kotlin 1.9.23 * 1.9.24 * Fix merge conflict --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Rick Busarow <[email protected]> Co-authored-by: Zac Sweers <[email protected]>
square · Jun 7, 2024 · 2297869 · 2297869
1 parent f1cbdbe
commit 2297869
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 27 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kotlin-version: [ 1.9.22 ]
+        kotlin-version: [ 1.9.24 ]
 
     steps:
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
@@ -36,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        kotlin-version: [ 1.9.22 ]
+        kotlin-version: [ 1.9.24 ]
 
     steps:
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
@@ -162,7 +162,7 @@ jobs:
       # solution.
       fail-fast: false
       matrix:
-        kotlin-version: [ 1.9.22 ]
+        kotlin-version: [ 1.9.24 ]
         agp-version: [ 7.1.1, 7.2.0, 7.3.1 ]
 
     steps:
@@ -194,7 +194,7 @@ jobs:
       # solution.
       fail-fast: false
       matrix:
-        kotlin-version: [ 1.9.22 ]
+        kotlin-version: [ 1.9.24 ]
 
     steps:
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4

diff --git a/annotations-optional/dependencies/runtimeClasspath.txt b/annotations-optional/dependencies/runtimeClasspath.txt
@@ -1,3 +1,3 @@
 javax.inject:javax.inject:1
-org.jetbrains.kotlin:kotlin-stdlib:1.9.22
+org.jetbrains.kotlin:kotlin-stdlib:1.9.24
 org.jetbrains:annotations:13.0
diff --git a/annotations/dependencies/runtimeClasspath.txt b/annotations/dependencies/runtimeClasspath.txt
@@ -1,2 +1,2 @@
-org.jetbrains.kotlin:kotlin-stdlib:1.9.22
+org.jetbrains.kotlin:kotlin-stdlib:1.9.24
 org.jetbrains:annotations:13.0
diff --git a/compiler-api/dependencies/runtimeClasspath.txt b/compiler-api/dependencies/runtimeClasspath.txt
@@ -1,8 +1,8 @@
 org.jetbrains.intellij.deps:trove4j:1.0.20200330
-org.jetbrains.kotlin:kotlin-bom:1.9.22
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.22
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.22
-org.jetbrains.kotlin:kotlin-reflect:1.9.22
-org.jetbrains.kotlin:kotlin-script-runtime:1.9.22
-org.jetbrains.kotlin:kotlin-stdlib:1.9.22
+org.jetbrains.kotlin:kotlin-bom:1.9.24
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.24
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.24
+org.jetbrains.kotlin:kotlin-reflect:1.9.24
+org.jetbrains.kotlin:kotlin-script-runtime:1.9.24
+org.jetbrains.kotlin:kotlin-stdlib:1.9.24
 org.jetbrains:annotations:13.0
diff --git a/compiler-utils/dependencies/runtimeClasspath.txt b/compiler-utils/dependencies/runtimeClasspath.txt
@@ -3,10 +3,10 @@ com.squareup:kotlinpoet-jvm:1.16.0
 com.squareup:kotlinpoet:1.16.0
 javax.inject:javax.inject:1
 org.jetbrains.intellij.deps:trove4j:1.0.20200330
-org.jetbrains.kotlin:kotlin-bom:1.9.22
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.22
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.22
-org.jetbrains.kotlin:kotlin-reflect:1.9.22
-org.jetbrains.kotlin:kotlin-script-runtime:1.9.22
-org.jetbrains.kotlin:kotlin-stdlib:1.9.22
+org.jetbrains.kotlin:kotlin-bom:1.9.24
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.24
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.24
+org.jetbrains.kotlin:kotlin-reflect:1.9.24
+org.jetbrains.kotlin:kotlin-script-runtime:1.9.24
+org.jetbrains.kotlin:kotlin-stdlib:1.9.24
 org.jetbrains:annotations:13.0
diff --git a/compiler/dependencies/runtimeClasspath.txt b/compiler/dependencies/runtimeClasspath.txt
@@ -5,10 +5,10 @@ com.squareup:kotlinpoet:1.16.0
 javax.annotation:jsr250-api:1.0
 javax.inject:javax.inject:1
 org.jetbrains.intellij.deps:trove4j:1.0.20200330
-org.jetbrains.kotlin:kotlin-bom:1.9.22
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.22
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.22
-org.jetbrains.kotlin:kotlin-reflect:1.9.22
-org.jetbrains.kotlin:kotlin-script-runtime:1.9.22
-org.jetbrains.kotlin:kotlin-stdlib:1.9.22
+org.jetbrains.kotlin:kotlin-bom:1.9.24
+org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.24
+org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.24
+org.jetbrains.kotlin:kotlin-reflect:1.9.24
+org.jetbrains.kotlin:kotlin-script-runtime:1.9.24
+org.jetbrains.kotlin:kotlin-stdlib:1.9.24
 org.jetbrains:annotations:13.0
diff --git a/gradle-plugin/dependencies/runtimeClasspath.txt b/gradle-plugin/dependencies/runtimeClasspath.txt
@@ -1,2 +1,2 @@
-org.jetbrains.kotlin:kotlin-stdlib:1.9.22
+org.jetbrains.kotlin:kotlin-stdlib:1.9.24
 org.jetbrains:annotations:13.0
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -32,11 +32,11 @@ kase = "0.11.1"
 kct = "0.4.0"
 kgx = "0.1.12"
 kotest = "5.9.1"
-kotlin = "1.9.22"
+kotlin = "1.9.24"
 kotlinx-binaryCompatibility = "0.14.0"
 kotlinpoet = "1.16.0"
 # If updating KSP version, we currently have ksp override logic in settings.gradle that needs to be updated too
-ksp = "1.9.22-1.0.17"
+ksp = "1.9.24-1.0.20"
 ktlint = "1.0.1"
 ktlintPlugin = "12.1.1"
 mavenPublish = "0.28.0"