Skip to content

Commit 084f56c

Browse files
feat: re-update to Kotlin 2.3.20 after resolving daemon issue.
1 parent 84796d7 commit 084f56c

3 files changed

Lines changed: 5 additions & 11 deletions

File tree

build-logic/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) 2026. Tony Robalik.
22
// SPDX-License-Identifier: Apache-2.0
33
plugins {
4-
id("org.jetbrains.kotlin.jvm") version "2.2.21" apply false
4+
id("org.jetbrains.kotlin.jvm") version "2.3.20" apply false
55
alias(libs.plugins.dependencyAnalysis)
66
}
77

build-logic/convention/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@ dependencies {
6767
because("For extending Gradle Plugin-Publish Plugin functionality")
6868
}
6969

70-
// Need to use embedded version for Gradle 9 compatibility.
71-
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${embeddedKotlinVersion}") {
70+
implementation(libs.kotlin.gradle) {
7271
because("For applying the kotlin-jvm plugin")
7372
}
7473
implementation(libs.kotlinDokkaGradlePlugin)

gradle/libs.versions.toml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,10 @@ javaTarget = "11"
2222
jdkVersion = "17"
2323
jspecify = "1.0.0"
2424
junit = "5.14.1"
25-
# TODO(tsr): downgraded to 2.2.21 due to issues with the kotlin-daemon-client.
26-
# See https://kotlinlang.slack.com/archives/C19FD9681/p1775698198510429.
2725
# IMPORTANT: keep this version in sync with build-logic/build.gradle.kts
28-
#kotlin = "2.3.20"
29-
#kotlinForAndroidtests = "2.3.20"
30-
#kotlinMetadata = "2.3.20"
31-
kotlin = "2.2.21"
32-
kotlinForAndroidtests = "2.2.21"
33-
kotlinMetadata = "2.2.21"
26+
kotlin = "2.3.20"
27+
kotlinForAndroidtests = "2.3.20"
28+
kotlinMetadata = "2.3.20"
3429
# TODO(tsr): update Dokka
3530
kotlinDokka = "2.0.0"
3631
# Cannot be called kotlin-editor as it causes `libs.versions.kotlin.get()` to fail

0 commit comments

Comments
 (0)