From d08d84ffb8df30b8caf69730a62ed121ed0cca90 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Mon, 2 Dec 2024 18:41:30 +0800 Subject: [PATCH] Bump Kotlin to 2.1.0, our dependencies the latest snapshots using Kotlin 2.1.0, and the project version to be explicit about this --- buildSrc/build.gradle.kts | 4 ++-- buildSrc/src/main/kotlin/VersionsAndDependencies.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 4b88d27..272da72 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -9,11 +9,11 @@ repositories { dependencies { // With Kotlin 2.0.20, a "Could not parse POM" build error occurs in the JVM projects of some dependent projects. - val kotlinVersion = "2.0.10" + val kotlinVersion = "2.1.0" implementation(kotlin("gradle-plugin", kotlinVersion)) implementation("org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion") implementation("org.jetbrains.compose:compose-gradle-plugin:1.7.0") - val huanshankejiGradlePluginsVersion = "0.7.0-SNAPSHOT" // TODO don't use a snapshot version in a main branch + val huanshankejiGradlePluginsVersion = "0.7.1-kotlin-2.1.0-SNAPSHOT" // TODO don't use a snapshot version in a main branch implementation("com.huanshankeji:kotlin-common-gradle-plugins:$huanshankejiGradlePluginsVersion") implementation("com.huanshankeji.team:gradle-plugins:$huanshankejiGradlePluginsVersion") implementation("com.huanshankeji:common-gradle-dependencies:0.8.0-20241016") // don't use a snapshot version in a main branch diff --git a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt index ab78c34..a5d3d5e 100644 --- a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt +++ b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt @@ -1,6 +1,6 @@ import com.huanshankeji.CommonDependencies -const val projectVersion = "0.4.1-SNAPSHOT" +const val projectVersion = "0.4.1-kotlin-2.1.0-SNAPSHOT" object DependencyVersions { val kobweb = "0.19.2"