From 07353fbe367ab5c27510d35e49d4076857f0e309 Mon Sep 17 00:00:00 2001 From: "sungyong.an" Date: Sun, 4 Oct 2026 13:44:35 +0900 Subject: [PATCH] Align Kotlin artifacts with the Kotlin BOM Removing the explicit kotlin-stdlib-jdk8 declarations in #346 let okhttp 4.12.0 pull kotlin-stdlib-jdk7/jdk8 down to 1.8.21. Add kotlin-bom, at the Kotlin plugin's version, as a platform in configureKotlin(), so the Android modules resolve Kotlin artifacts at 2.2.21 again. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01Upxj1FvQeDpycupKdPQHUZ --- app/dependencies/releaseRuntimeClasspath.txt | 5 +++-- .../src/main/kotlin/soup/movie/buildlogic/Kotlin.kt | 8 ++++++++ gradle/libs.versions.toml | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/dependencies/releaseRuntimeClasspath.txt b/app/dependencies/releaseRuntimeClasspath.txt index ef602f69..265e1b7a 100644 --- a/app/dependencies/releaseRuntimeClasspath.txt +++ b/app/dependencies/releaseRuntimeClasspath.txt @@ -213,9 +213,10 @@ org.jetbrains.compose.ui:ui-text:1.8.2 org.jetbrains.compose.ui:ui-unit:1.8.2 org.jetbrains.compose.ui:ui-util:1.8.2 org.jetbrains.compose.ui:ui:1.8.2 +org.jetbrains.kotlin:kotlin-bom:2.2.21 org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21 org.jetbrains.kotlin:kotlin-stdlib:2.2.21 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2 diff --git a/build-logic/convention/src/main/kotlin/soup/movie/buildlogic/Kotlin.kt b/build-logic/convention/src/main/kotlin/soup/movie/buildlogic/Kotlin.kt index 119d3ab6..a61081dc 100644 --- a/build-logic/convention/src/main/kotlin/soup/movie/buildlogic/Kotlin.kt +++ b/build-logic/convention/src/main/kotlin/soup/movie/buildlogic/Kotlin.kt @@ -1,6 +1,9 @@ package soup.movie.buildlogic import org.gradle.api.Project +import org.gradle.api.artifacts.VersionCatalogsExtension +import org.gradle.kotlin.dsl.dependencies +import org.gradle.kotlin.dsl.getByType import org.gradle.kotlin.dsl.withType import org.jetbrains.kotlin.gradle.dsl.JvmTarget import org.jetbrains.kotlin.gradle.tasks.KotlinCompile @@ -22,4 +25,9 @@ fun Project.configureKotlin() { ) } } + + val libs = extensions.getByType().named("libs") + dependencies { + implementation(platform(libs.findLibrary("kotlin-bom").get())) + } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c6a6f260..84c47cc8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -48,6 +48,7 @@ timber = "5.0.1" # Kotlin +kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" } kotlin-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" } coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }