Skip to content

Commit 8a6312d

Browse files
committed
Upgrade to Kotlin 1.9.20
1 parent e7a6cee commit 8a6312d

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs :
1616
strategy :
1717
fail-fast : false
1818
matrix :
19-
kotlin-version : [ 1.8.22, 1.9.10 ]
19+
kotlin-version : [ 1.8.22, 1.9.20 ]
2020

2121
steps :
2222
- uses : actions/checkout@v3
@@ -173,7 +173,7 @@ jobs :
173173
# solution.
174174
fail-fast : false
175175
matrix :
176-
kotlin-version : [ 1.8.22, 1.9.10 ]
176+
kotlin-version : [ 1.8.22, 1.9.20 ]
177177
agp-version : [ 7.1.1, 7.2.0, 7.3.1 ]
178178

179179
steps :
@@ -205,7 +205,7 @@ jobs :
205205
# solution.
206206
fail-fast : false
207207
matrix :
208-
kotlin-version : [ 1.8.22, 1.9.10 ]
208+
kotlin-version : [ 1.8.22, 1.9.20 ]
209209

210210
steps :
211211
- uses : actions/checkout@v3

build-logic/settings/src/main/kotlin/com/squareup/anvil/builds/settings/SettingsPlugin.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ abstract class SettingsPlugin @Inject constructor(
3434
if (alias == "kotlin" && value.toString().startsWith("1.8")) {
3535
// TODO hardcoded to match what's in libs.versions.toml, but kinda ugly
3636
catalogBuilder.overrideVersion(alias = "ksp", versionString = "$value-1.0.11")
37+
// KCT versions after 0.3.2 are not compatible with Kotlin 1.8
38+
catalogBuilder.overrideVersion(alias = "kct", versionString = "0.3.2")
3739
}
3840
}
3941

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ jUnit5 = "5.10.1"
2525
jvm-toolchain = "11"
2626
jvm-target-library = "8"
2727
jvm-target-minimal = "11"
28-
kct = "0.3.1"
28+
kct = "0.4.0"
2929
kgx = "0.1.9"
30-
kotlin = "1.9.10"
30+
kotlin = "1.9.20"
3131
kotlinpoet = "1.14.2"
3232
# If updating KSP version, we currently have ksp override logic in settings.gradle that needs to be updated too
33-
ksp = "1.9.10-1.0.13"
33+
ksp = "1.9.20-1.0.14"
3434
ktlint = "1.0.1"
3535
ktlintPlugin = "12.0.3"
3636
mavenPublish = "0.25.3"
@@ -104,7 +104,7 @@ kotlin-compiler = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable",
104104
kotlin-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
105105
kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
106106
kotlin-gradlePluginApi = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin-api", version.ref = "kotlin" }
107-
kotlin-metadata = "org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.6.2"
107+
kotlin-metadata = "org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.8.0"
108108
kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlin" }
109109
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
110110

0 commit comments

Comments
 (0)