Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build-logic/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) 2026. Tony Robalik.
// SPDX-License-Identifier: Apache-2.0
plugins {
id("org.jetbrains.kotlin.jvm") version "2.2.21" apply false
id("org.jetbrains.kotlin.jvm") version "2.3.20" apply false
alias(libs.plugins.dependencyAnalysis)
}

Expand Down
3 changes: 1 addition & 2 deletions build-logic/convention/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@ dependencies {
because("For extending Gradle Plugin-Publish Plugin functionality")
}

// Need to use embedded version for Gradle 9 compatibility.
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${embeddedKotlinVersion}") {
implementation(libs.kotlin.gradle) {
because("For applying the kotlin-jvm plugin")
}
implementation(libs.kotlinDokkaGradlePlugin)
Expand Down
11 changes: 3 additions & 8 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,10 @@ javaTarget = "11"
jdkVersion = "17"
jspecify = "1.0.0"
junit = "5.14.1"
# TODO(tsr): downgraded to 2.2.21 due to issues with the kotlin-daemon-client.
# See https://kotlinlang.slack.com/archives/C19FD9681/p1775698198510429.
# IMPORTANT: keep this version in sync with build-logic/build.gradle.kts
#kotlin = "2.3.20"
#kotlinForAndroidtests = "2.3.20"
#kotlinMetadata = "2.3.20"
kotlin = "2.2.21"
kotlinForAndroidtests = "2.2.21"
kotlinMetadata = "2.2.21"
kotlin = "2.3.20"
kotlinForAndroidtests = "2.3.20"
kotlinMetadata = "2.3.20"
# TODO(tsr): update Dokka
kotlinDokka = "2.0.0"
# Cannot be called kotlin-editor as it causes `libs.versions.kotlin.get()` to fail
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ final class DominanceTreeProject extends AbstractAndroidProject {
}

final expectedTree = """\
10.01 MiB :app
10.05 MiB :app
+--- 8.32 MiB (1.69 MiB) androidx.appcompat:appcompat:1.7.1
| +--- 2.70 MiB (2.63 MiB) androidx.core:core:1.13.0
| | \\--- 0.07 MiB androidx.versionedparcelable:versionedparcelable:1.1.1
| +--- 1.43 MiB (0.02 MiB) org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4
| | +--- 1.41 MiB org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4
| | | \\--- 1.41 MiB (1.41 MiB) org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4
| | | \\--- org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21
| | | \\--- org.jetbrains.kotlin:kotlin-stdlib-common:2.3.20
| | \\--- 0.00 MiB (0.00 MiB) org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0
| | \\--- 0.00 MiB org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0
| +--- 0.86 MiB (0.62 MiB) androidx.fragment:fragment:1.5.4
Expand Down Expand Up @@ -81,7 +81,7 @@ final class DominanceTreeProject extends AbstractAndroidProject {
| +--- 0.02 MiB androidx.lifecycle:lifecycle-livedata-core:2.6.2
| +--- 0.01 MiB androidx.arch.core:core-common:2.2.0
| \\--- 0.01 MiB androidx.annotation:annotation-experimental:1.4.0
+--- 1.70 MiB (1.68 MiB) org.jetbrains.kotlin:kotlin-stdlib:2.2.21
+--- 1.74 MiB (1.72 MiB) org.jetbrains.kotlin:kotlin-stdlib:2.3.20
| \\--- 0.02 MiB org.jetbrains:annotations:13.0
\\--- 0.00 MiB :lib""".stripIndent().readLines()
}
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,10 @@ final class DuplicateDependencyVersionsProject extends AbstractAndroidProject {
junit-junit-4-12 = { module = "junit:junit", version = "4.12" }
junit-junit-4-13 = { module = "junit:junit", version = "4.13" }
org-hamcrest-hamcrest-core-1-3 = { module = "org.hamcrest:hamcrest-core", version = "1.3" }
org-jetbrains-kotlin-kotlin-stdlib-common-2-2-21 = { module = "org.jetbrains.kotlin:kotlin-stdlib-common", version = "2.2.21" }
org-jetbrains-kotlin-kotlin-stdlib-common-2-3-20 = { module = "org.jetbrains.kotlin:kotlin-stdlib-common", version = "2.3.20" }
org-jetbrains-kotlin-kotlin-stdlib-jdk7-1-8-0 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk7", version = "1.8.0" }
org-jetbrains-kotlin-kotlin-stdlib-jdk8-1-8-0 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version = "1.8.0" }
org-jetbrains-kotlin-kotlin-stdlib-2-2-21 = { module = "org.jetbrains.kotlin:kotlin-stdlib", version = "2.2.21" }
org-jetbrains-kotlin-kotlin-stdlib-2-3-20 = { module = "org.jetbrains.kotlin:kotlin-stdlib", version = "2.3.20" }
org-jetbrains-kotlinx-kotlinx-coroutines-android-1-6-4 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version = "1.6.4" }
org-jetbrains-kotlinx-kotlinx-coroutines-core-jvm-1-6-4 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm", version = "1.6.4" }
org-jetbrains-kotlinx-kotlinx-coroutines-core-1-6-4 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.6.4" }
Expand Down
Loading