Merge branch 'dependent-on-bootstrapping-snapshots'

huanshankeji · Jan 30, 2024 · 45fe205 · 45fe205
2 parents eca744e + 4583bfd
commit 45fe205
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -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.0-20231111") { exclude("org.jetbrains.kotlin") }
+    implementation("com.huanshankeji:common-gradle-dependencies:0.7.1-20231111") { exclude("org.jetbrains.kotlin") }
 }
diff --git a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt b/buildSrc/src/main/kotlin/VersionsAndDependencies.kt
@@ -13,6 +13,6 @@ val alignedPluginVersion = "0.5.0-SNAPSHOT"
 val commonGradleDependenciesVersion = "0.7.1-20231111-SNAPSHOT"
 
 // This is the source dependency version. There is another build source dependency in "buildSrc/build.gradle.kts".
-val pluginProjectDependentStableCommonGradleDependenciesVersion = "0.7.0-20231111".apply {
+val pluginProjectSourceDependentStableCommonGradleDependenciesVersion = "0.7.1-20231111".apply {
     require(!endsWith("SNAPSHOT"))
 }
diff --git a/buildSrc/src/main/kotlin/aligned-version-plugin-conventions.gradle.kts b/buildSrc/src/main/kotlin/aligned-version-plugin-conventions.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 version = alignedPluginVersion
 
 dependencies {
-    implementation("com.huanshankeji:common-gradle-dependencies:$pluginProjectDependentStableCommonGradleDependenciesVersion")
+    implementation("com.huanshankeji:common-gradle-dependencies:$pluginProjectSourceDependentStableCommonGradleDependenciesVersion")
 }
 
 tasks.named<KotlinCompilationTask<*>>("compileKotlin").configure {

diff --git a/kotlin-common-gradle-plugins/build.gradle.kts b/kotlin-common-gradle-plugins/build.gradle.kts
@@ -6,8 +6,7 @@ dependencies {
     //implementation("io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.30.0")
 
     implementation("org.jetbrains.kotlinx:kotlinx-benchmark-plugin:0.4.9")
-    // TODO
-    //implementation(commonGradleClasspathDependencies.kotlinx.benchmark.pluginProject())
+    implementation(commonGradleClasspathDependencies.kotlinx.benchmark.pluginProject())
     implementation("org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion")
 
     testImplementation(kotlin("test"))