From 79bdc168b40036ca8cabb4035bc997937362e8fd Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Mon, 2 Dec 2024 18:49:58 +0800 Subject: [PATCH 1/3] Bump our dependencies the latest snapshots using Kotlin 2.1.0, and the project version to be specific about Kotlin 2.1.0 --- buildSrc/build.gradle.kts | 4 ++-- buildSrc/src/main/kotlin/VersionsAndDependencies.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 5f62dd70..15c83745 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -11,11 +11,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") - implementation("com.huanshankeji.team:gradle-plugins:0.6.0") // don't use a snapshot version in a main branch + implementation("com.huanshankeji.team:gradle-plugins:0.7.1-kotlin-2.1.0-SNAPSHOT") // TODO don't use a snapshot version in a main branch implementation("com.android.tools.build:gradle:8.5.2") 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 e2462300..cb8fc806 100644 --- a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt +++ b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt @@ -1,14 +1,14 @@ import com.huanshankeji.CommonDependencies import org.jetbrains.compose.ComposeBuildConfig -val projectVersion = "0.5.0-SNAPSHOT" +val projectVersion = "0.5.0-kotlin-2.1.0-SNAPSHOT" val commonDependencies = CommonDependencies() object DependencyVersions { const val composeMultiplatform = ComposeBuildConfig.composeVersion // for "ui-unit" val kobweb = "0.19.2" - val huanshankejiComposeHtml = "0.4.0" // don't use a snapshot version in a main branch + val huanshankejiComposeHtml = "0.4.1-kotlin-2.1.0-SNAPSHOT" // TODO don't use a snapshot version in a main branch val kmdc = "0.1.2" val materialSymbols = "0.25.1" } From c7795f70e49c2d55b9b9404807ae8fc93855397a Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Mon, 2 Dec 2024 21:24:49 +0800 Subject: [PATCH 2/3] Add `mavenLocal()` for our snapshot dependencies (both build dependencies and library dependencies) to resolve --- buildSrc/build.gradle.kts | 2 +- buildSrc/src/main/kotlin/common-conventions.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 15c83745..324b321d 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -3,7 +3,7 @@ plugins { } repositories { - //mavenLocal() // comment out when not needed + mavenLocal() // TODO comment out when not needed so the build is always reproducible by others gradlePluginPortal() google() mavenCentral() diff --git a/buildSrc/src/main/kotlin/common-conventions.gradle.kts b/buildSrc/src/main/kotlin/common-conventions.gradle.kts index de8d1d92..01cfe2f1 100644 --- a/buildSrc/src/main/kotlin/common-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/common-conventions.gradle.kts @@ -8,7 +8,7 @@ plugins { } repositories { - //mavenLocal() // commented out so the build is always reproducible by others // put back if needed when depending on a snapshot + mavenLocal() // TODO comment out when not needed so the build is always reproducible by others mavenCentral() google() maven("https://us-central1-maven.pkg.dev/varabyte-repos/public") // for Kobweb From 23b4cf1d368866f9f0eefb4c1996493bcbd9d78e Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Wed, 4 Dec 2024 02:35:48 +0800 Subject: [PATCH 3/3] Bump our Gradle plugins to the latest stable version and remove the explicit "kotlin-2.1.0" in the library and project versions --- buildSrc/build.gradle.kts | 2 +- buildSrc/src/main/kotlin/VersionsAndDependencies.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 324b321d..41689fab 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -15,7 +15,7 @@ dependencies { implementation(kotlin("gradle-plugin", kotlinVersion)) implementation("org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlinVersion") implementation("org.jetbrains.compose:compose-gradle-plugin:1.7.0") - implementation("com.huanshankeji.team:gradle-plugins:0.7.1-kotlin-2.1.0-SNAPSHOT") // TODO don't use a snapshot version in a main branch + implementation("com.huanshankeji.team:gradle-plugins:0.8.0") // don't use a snapshot version in a main branch implementation("com.android.tools.build:gradle:8.5.2") 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 cb8fc806..8f7cabb0 100644 --- a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt +++ b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt @@ -1,14 +1,14 @@ import com.huanshankeji.CommonDependencies import org.jetbrains.compose.ComposeBuildConfig -val projectVersion = "0.5.0-kotlin-2.1.0-SNAPSHOT" +val projectVersion = "0.5.0-SNAPSHOT" val commonDependencies = CommonDependencies() object DependencyVersions { const val composeMultiplatform = ComposeBuildConfig.composeVersion // for "ui-unit" val kobweb = "0.19.2" - val huanshankejiComposeHtml = "0.4.1-kotlin-2.1.0-SNAPSHOT" // TODO don't use a snapshot version in a main branch + val huanshankejiComposeHtml = "0.4.1-SNAPSHOT" // TODO don't use a snapshot version in a main branch val kmdc = "0.1.2" val materialSymbols = "0.25.1" }