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

v0.7.1-20240314-boostrap release

buildSrc/build.gradle.kts

@@ -25,13 +25,13 @@ dependencies {
     }
     */
     // for `KotlinCompilationTask` and the version is for Compose 1.5.1
-    implementation(kotlin("gradle-plugin", "1.9.20"))
-    implementation("org.gradle.kotlin:gradle-kotlin-dsl-plugins:4.1.2") // This version has to be used for Gradle 8.4.
+    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.
 
     implementation("com.gradle.publish:plugin-publish-plugin:1.2.1")
 
     // 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") }
 }

buildSrc/src/main/kotlin/VersionsAndDependencies.kt

@@ -4,15 +4,15 @@ import com.huanshankeji.CommonVersions
 val commonVersions = CommonVersions()
 val commonGradleClasspathDependencies = CommonGradleClasspathDependencies(commonVersions)
 
-val kotlinVersion = "1.9.20" // for Compose 1.4.0 // TODO remove this comment
+val kotlinVersion = "1.9.23" // for Compose 1.6.1
 
-val alignedPluginVersion = "0.5.0-SNAPSHOT"
+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-20231111"
+val commonGradleDependenciesVersion = "0.7.1-20240314-boostrap"
 
 // 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"))
 }

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 {

buildSrc/src/main/kotlin/conventions.gradle.kts

@@ -16,7 +16,7 @@ dependencies {
     implementation(kotlin("gradle-plugin", kotlinVersion))
 }
 
-java.toolchain.languageVersion.set(JavaLanguageVersion.of(8))
+kotlin.jvmToolchain(8)
 
 
 gradlePlugin {

common-gradle-dependencies/src/main/kotlin/com/huanshankeji/CommonVersions.kt

@@ -7,20 +7,20 @@ class CommonVersions @JvmOverloads constructor(
 
     val kotlinCommon: String = "0.3.0",
 
-    val kotlinxCoroutines: String = "1.7.3",
-    val kotlinxHtml: String = "0.9.1",
-    val kotlinxSerialization: String = "1.6.0",
-    val kotlinxDatetime: String = "0.4.1",
-    val kotlinxBenchmark: String = "0.4.9",
-    val exposed: String = "0.44.1",
-    val ktor: String = "2.3.6",
-    val composeMultiplatform: String = "1.5.10", // this is usually only used in classpath dependencies
+    val kotlinxCoroutines: String = "1.8.0",
+    val kotlinxHtml: String = "0.11.0",
+    val kotlinxSerialization: String = "1.6.3",
+    val kotlinxDatetime: String = "0.5.0",
+    val kotlinxBenchmark: String = "0.4.10",
+    val exposed: String = "0.48.0",
+    val ktor: String = "2.3.9",
+    val composeMultiplatform: String = "1.6.1", // this is usually only used in classpath dependencies
 
-    val vertx: String = "4.4.6", // TODO bump to "4.5.0". There are some breaking changes however. See https://github.com/vert-x3/wiki/wiki/4.5.0-Deprecations-and-breaking-changes.
-    val arrow: String = "1.2.1",
-    val orgJunit: String = "5.10.1",
-    val kotest: String = "5.8.0",
-    val postgreSql: String = "42.6.0",
+    val vertx: String = "4.5.5",
+    val arrow: String = "1.2.3",
+    val orgJunit: String = "5.10.2",
+    val kotest: String = "5.8.1",
+    val postgreSql: String = "42.7.2",
     val slf4j: String = "1.7.36", // TODO: consider replacing with kotlin-logging (https://github.com/oshai/kotlin-logging)
-    val testContainers: String = "1.19.1"
+    val testContainers: String = "1.19.7"
 )

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

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"))