Skip to content

Commit

Permalink
Upgrade to Kotlin 1.9.10
Browse files Browse the repository at this point in the history
Also update to the latest KSP version.
  • Loading branch information
JoelWilcox committed Sep 8, 2023
1 parent 2892dce commit cebd679
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs :
strategy :
fail-fast : false
matrix :
kotlin-version : [ 1.8.22, 1.9.0 ]
kotlin-version : [ 1.8.22, 1.9.10 ]

steps :
- uses : actions/checkout@v3
Expand Down Expand Up @@ -162,7 +162,7 @@ jobs :
# solution.
fail-fast : false
matrix :
kotlin-version : [ 1.8.22, 1.9.0 ]
kotlin-version : [ 1.8.22, 1.9.10 ]
agp-version : [ 7.1.1, 7.2.0, 7.3.1 ]

steps :
Expand Down Expand Up @@ -213,7 +213,7 @@ jobs :
# solution.
fail-fast : false
matrix :
kotlin-version : [ 1.8.22, 1.9.0 ]
kotlin-version : [ 1.8.22, 1.9.10 ]

steps :
- uses : actions/checkout@v3
Expand Down
5 changes: 3 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@ dagger = "2.46.1"
dokka = "1.8.20"
espresso = "3.5.1"
gradlePublish = "0.15.0"
kotlin = "1.9.0"
kotlin = "1.9.10"
kct = "0.3.1"
kotlinpoet = "1.14.2"
ksp = "1.9.0-1.0.11"
# If updating KSP version, we currently have ksp override logic in settings.gradle that needs to be updated too
ksp = "1.9.10-1.0.13"
ktlint = "0.41.0"
ktlintPlugin = "10.2.0"
mavenPublish = "0.18.0"
Expand Down
7 changes: 6 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@ dependencyResolutionManagement {
overrides.put(keyString, value.toString())
if (keyString.endsWith("_kotlin")) {
// TODO hardcoded to match what's in libs.versions.toml, but kinda ugly
overrides.put("override_ksp", "$value-1.0.11")
String kspPartialVersion = "1.0.13"
if (value.toString().startsWith("1.8")) {
// Latest KSP releases currently don't support Kotlin 1.8.x
kspPartialVersion = "1.0.11"
}
overrides.put("override_ksp", "$value-$kspPartialVersion")
}
}
}
Expand Down

0 comments on commit cebd679

Please sign in to comment.