Skip to content

Commit

Permalink
Update Kotlin 1.9 (and friends)
Browse files Browse the repository at this point in the history
Force kotlin 1.9 in build logic so that while using plugins that default to what is already being used they won't leak in previous versions.
  • Loading branch information
steve-the-edwards committed Oct 23, 2023
1 parent 55edfc1 commit 0d49346
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 10 deletions.
5 changes: 5 additions & 0 deletions build-logic/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
plugins {
// Hardcoded as this is upstream of the version catalog. Keep this in sync with that.
kotlin("jvm") version "1.9.10" apply false
}

dependencyResolutionManagement {

@Suppress("UnstableApiUsage")
Expand Down
19 changes: 9 additions & 10 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ androidx-activity = "1.6.1"
androidx-appcompat = "1.6.1"
androidx-benchmark = "1.1.1"
androidx-cardview = "1.0.0"
androidx-compose-compiler = "1.4.4"
androidx-compose-compiler = "1.5.3"
# see https://developer.android.com/jetpack/compose/bom/bom-mapping
androidx-compose-bom = "2023.01.00"
androidx-constraintlayout = "2.1.4"
Expand All @@ -37,30 +37,29 @@ androidx-tracing = "1.1.0"
androidx-transition = "1.4.1"

detekt = "1.19.0"
dokka = "1.8.20"
dokka = "1.9.0"
dependencyGuard = "0.4.3"

google-accompanist = "0.18.0"
google-dagger = "2.40.5"
google-ksp = "1.8.10-1.0.9"
google-ksp = "1.9.10-1.0.13"
google-material = "1.4.0"

groovy = "3.0.9"
jUnit = "4.13.2"
java-diff-utils = "4.12"
javaParser = "3.24.0"
kotest = "5.1.0"
kotlin = "1.8.10"
kotlin = "1.9.10"

kotlinx-binary-compatibility = "0.13.2"
kotlinx-coroutines = "1.7.1"
kotlinx-serialization-json = "1.5.1"
kotlinx-atomicfu = "0.21.0"
kotlinx-coroutines = "1.7.3"
kotlinx-serialization-json = "1.6.0"
kotlinx-atomicfu = "0.22.0"

ktlint = "0.49.1"
ktlint-gradle = "0.1.7"
ktlint-gradle = "0.1.8"
material = "1.3.0"
mavenPublish = "0.13.0"

mockito-core = "3.12.4"
mockito-kotlin = "3.2.0"
Expand All @@ -85,7 +84,7 @@ squareup-workflow = "1.0.0"
timber = "5.0.1"
truth = "1.1.5"
turbine = "1.0.0"
vanniktech-publish = "0.25.2"
vanniktech-publish = "0.25.3"

[plugins]

Expand Down

0 comments on commit 0d49346

Please sign in to comment.