From a2527db5ef2fc860366d3b6bfeccdb0c7cb656f4 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Mon, 2 Dec 2024 17:49:10 +0800 Subject: [PATCH 1/4] Make the project version explicit --- buildSrc/src/main/kotlin/VersionsAndDependencies.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt index de17811..1aeaaac 100644 --- a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt +++ b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt @@ -1,7 +1,7 @@ import com.huanshankeji.CommonDependencies import com.huanshankeji.CommonVersions -val projectVersion = "0.3.1-SNAPSHOT" +val projectVersion = "0.3.1-kotlin-2.1.0-SNAPSHOT" val commonVersions = CommonVersions(kotlinCommon = "0.6.0", exposed = "0.56.0") val commonDependencies = CommonDependencies(commonVersions) From 9bac924a2b900df99a6e1bd28f6ae099fd50ffd0 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Mon, 2 Dec 2024 18:33:14 +0800 Subject: [PATCH 2/4] Bump our dependencies the latest snapshots using Kotlin 2.1.0 --- buildSrc/build.gradle.kts | 2 +- buildSrc/src/main/kotlin/VersionsAndDependencies.kt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 794cb8d..c2ff274 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -18,6 +18,6 @@ dependencies { // With Kotlin 2.0.20, a "Could not parse POM" build error occurs in the JVM projects of some dependent projects. implementation(kotlin("gradle-plugin", "2.1.0")) implementation("com.huanshankeji:common-gradle-dependencies:0.8.0-20241016") // don't use a snapshot version in a main branch - implementation("com.huanshankeji.team:gradle-plugins:0.7.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("org.jetbrains.dokka:dokka-gradle-plugin:2.0.0-Beta") } diff --git a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt index 1aeaaac..7f6ff58 100644 --- a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt +++ b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt @@ -3,5 +3,6 @@ import com.huanshankeji.CommonVersions val projectVersion = "0.3.1-kotlin-2.1.0-SNAPSHOT" -val commonVersions = CommonVersions(kotlinCommon = "0.6.0", exposed = "0.56.0") +// TODO don't use a snapshot version in a main branch +val commonVersions = CommonVersions(kotlinCommon = "0.6.1-kotlin-2.1.0-SNAPSHOT", exposed = "0.56.0") val commonDependencies = CommonDependencies(commonVersions) From 2e32f83d40ce10e7f6d43bb6a68277b09fc25709 Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Wed, 4 Dec 2024 01:23:18 +0800 Subject: [PATCH 3/4] Bump our Gradle plugins to the latest stable version v0.8.0 and remove the explicit "kotlin-2.1.0" in the project version --- 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 c2ff274..2ec3da5 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -18,6 +18,6 @@ dependencies { // With Kotlin 2.0.20, a "Could not parse POM" build error occurs in the JVM projects of some dependent projects. implementation(kotlin("gradle-plugin", "2.1.0")) implementation("com.huanshankeji:common-gradle-dependencies:0.8.0-20241016") // 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.huanshankeji.team:gradle-plugins:0.8.0") // don't use a snapshot version in a main branch implementation("org.jetbrains.dokka:dokka-gradle-plugin:2.0.0-Beta") } diff --git a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt index 7f6ff58..2d265cc 100644 --- a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt +++ b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt @@ -1,8 +1,8 @@ import com.huanshankeji.CommonDependencies import com.huanshankeji.CommonVersions -val projectVersion = "0.3.1-kotlin-2.1.0-SNAPSHOT" +val projectVersion = "0.3.1-SNAPSHOT" // TODO don't use a snapshot version in a main branch -val commonVersions = CommonVersions(kotlinCommon = "0.6.1-kotlin-2.1.0-SNAPSHOT", exposed = "0.56.0") +val commonVersions = CommonVersions(kotlinCommon = "0.6.1-SNAPSHOT", exposed = "0.56.0") val commonDependencies = CommonDependencies(commonVersions) From 358a2d4f0444f7c1c88f2cadd572ac464c4b148b Mon Sep 17 00:00:00 2001 From: Yongshun Shreck Ye Date: Thu, 5 Dec 2024 17:36:12 +0800 Subject: [PATCH 4/4] Bump kotlin-common to v0.6.1 and remove the explicit Exposed version --- buildSrc/src/main/kotlin/VersionsAndDependencies.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt index 2d265cc..dcdda67 100644 --- a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt +++ b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt @@ -3,6 +3,6 @@ import com.huanshankeji.CommonVersions val projectVersion = "0.3.1-SNAPSHOT" -// TODO don't use a snapshot version in a main branch -val commonVersions = CommonVersions(kotlinCommon = "0.6.1-SNAPSHOT", exposed = "0.56.0") +// don't use a snapshot version in a main branch +val commonVersions = CommonVersions(kotlinCommon = "0.6.1") val commonDependencies = CommonDependencies(commonVersions)