Merge branch 'main' into common-gradle-dependencies-release

v0.7.1-20240314 release
huanshankeji · Mar 15, 2024 · 682706c · 682706c
2 parents fb98112 + 5eda82b
commit 682706c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -24,7 +24,7 @@ dependencies {
         implementation("org.jetbrains.kotlin:kotlin-sam-with-receiver:1.8.0")
     }
     */
-    // for `KotlinCompilationTask` and the version is for Compose 1.5.1
+    // for `KotlinCompilationTask` and the version is for Compose 1.6.1
     implementation(kotlin("gradle-plugin", "1.9.23"))
     implementation("org.gradle.kotlin:gradle-kotlin-dsl-plugins:4.2.1") // This version has to be used for Gradle 8.6.
 
@@ -33,5 +33,5 @@ dependencies {
     // This is a bootstrapping dependency (cross-version self-dependency). Try not to update its version unless necessary.
     implementation("com.huanshankeji.team:gradle-plugins:0.3.0") { exclude("org.jetbrains.kotlin") }
     // This is also a bootstrapping dependency.
-    implementation("com.huanshankeji:common-gradle-dependencies:0.7.1-20231111") { exclude("org.jetbrains.kotlin") }
+    implementation("com.huanshankeji:common-gradle-dependencies:0.7.1-20240314-boostrap") { exclude("org.jetbrains.kotlin") }
 }
diff --git a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt
@@ -10,9 +10,9 @@ val alignedPluginVersion = "0.5.1-SNAPSHOT"
 
 // "x.y.z" indicates the version of the way of organizing the code,
 // and the date indicates the version when the dependency versions are updated.
-val commonGradleDependenciesVersion = "0.7.1-20240314-boostrap"
+val commonGradleDependenciesVersion = "0.7.1-20240314"
 
 // This is the source dependency version. There is another build source dependency in "buildSrc/build.gradle.kts".
-val pluginProjectSourceDependentStableCommonGradleDependenciesVersion = "0.7.1-20231111".apply {
+val pluginProjectSourceDependentStableCommonGradleDependenciesVersion = "0.7.1-20240314-boostrap".apply {
     require(!endsWith("SNAPSHOT"))
 }
diff --git a/common-gradle-dependencies/src/main/kotlin/com/huanshankeji/CommonVersions.kt b/common-gradle-dependencies/src/main/kotlin/com/huanshankeji/CommonVersions.kt
@@ -5,7 +5,7 @@ import kotlinVersion
 class CommonVersions @JvmOverloads constructor(
     val kotlin: String = kotlinVersion,
 
-    val kotlinCommon: String = "0.3.0",
+    val kotlinCommon: String = "0.4.0",
 
     val kotlinxCoroutines: String = "1.8.0",
     val kotlinxHtml: String = "0.11.0",