diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 6ef7b7f..aa66f6d 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -24,14 +24,14 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-sam-with-receiver:1.8.0") } */ - // 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. + // 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. 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.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 index de8eb28..bd9670f 100644 --- a/buildSrc/src/main/kotlin/VersionsAndDependencies.kt +++ b/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" +val alignedPluginVersion = "0.5.1" // "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-SNAPSHOT" +val commonGradleDependenciesVersion = "0.7.1-20240314-boostrap-SNAPSHOT" // 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/buildSrc/src/main/kotlin/conventions.gradle.kts b/buildSrc/src/main/kotlin/conventions.gradle.kts index 84545cb..3bc48bb 100644 --- a/buildSrc/src/main/kotlin/conventions.gradle.kts +++ b/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 { diff --git a/common-gradle-dependencies/src/main/kotlin/com/huanshankeji/CommonVersions.kt b/common-gradle-dependencies/src/main/kotlin/com/huanshankeji/CommonVersions.kt index 465db30..dbf38aa 100644 --- a/common-gradle-dependencies/src/main/kotlin/com/huanshankeji/CommonVersions.kt +++ b/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" ) \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135..d64cd49 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8838ba9..2ea3535 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/gradlew.bat b/gradlew.bat index 93e3f59..25da30d 100644 --- a/gradlew.bat +++ b/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