[*] Modernize Gradle setup

Version catalog and convention plugin instead of allprojects/subprojects

build.gradle.kts

@@ -1,75 +1,7 @@
 plugins {
     id("java")
     id("maven-publish")
-    id("de.siphalor.tweed5.local-runtime-only")
 }
 
 group = "de.siphalor.tweed5"
 version = properties["version"]!!
-
-allprojects {
-    apply(plugin = "java")
-    apply(plugin = "java-library")
-    apply(plugin = "maven-publish")
-    apply(plugin = "de.siphalor.tweed5.local-runtime-only")
-
-    group = rootProject.group
-    version = properties["version"]!!
-
-    java {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-
-    repositories {
-        mavenCentral()
-    }
-
-    sourceSets.test.get().runtimeClasspath += sourceSets.main.get().runtimeClasspath
-
-        dependencies {
-        val lombok = "org.projectlombok:lombok:${properties["lombok.version"]}"
-        compileOnly(lombok)
-        annotationProcessor(lombok)
-        testCompileOnly(lombok)
-        testAnnotationProcessor(lombok)
-
-        val autoServiceAnnotations = "com.google.auto.service:auto-service-annotations:${properties["auto_service.version"]}"
-        val autoService = "com.google.auto.service:auto-service:${properties["auto_service.version"]}"
-        compileOnly(autoServiceAnnotations)
-        annotationProcessor(autoService)
-        testCompileOnly(autoServiceAnnotations)
-        testAnnotationProcessor(autoService)
-
-        implementation("org.jetbrains:annotations:${properties["jetbrains_annotations.version"]}")
-
-        implementation("org.slf4j:slf4j-api:${properties["slf4j.version"]}")
-        localRuntimeOnly("org.slf4j:slf4j-simple:${properties["slf4j.version"]}")
-
-        testImplementation(platform("org.junit:junit-bom:${properties["junit.version"]}"))
-        testImplementation("org.junit.jupiter:junit-jupiter")
-        testImplementation("org.mockito:mockito-core:${properties["mockito.version"]}")
-        testImplementation("org.assertj:assertj-core:${properties["assertj.version"]}")
-    }
-
-    tasks.test {
-        useJUnitPlatform()
-        systemProperties(
-            "junit.jupiter.execution.timeout.mode" to "disabled_on_debug",
-            "junit.jupiter.execution.timeout.testable.method.default" to "10s",
-            "junit.jupiter.execution.timeout.thread.mode.default" to "SEPARATE_THREAD",
-        )
-    }
-
-    publishing {
-        publications {
-            create<MavenPublication>("maven") {
-                groupId = project.group.toString()
-                artifactId = project.name
-                version = project.version.toString()
-
-                from(components["java"])
-            }
-        }
-    }
-}

buildSrc/settings.gradle.kts

@@ -1 +1,5 @@
+plugins {
+    id("dev.panuszewski.typesafe-conventions") version "0.4.1"
+}
+
 rootProject.name = "tweed5-conventions"

buildSrc/src/main/kotlin/de.siphalor.tweed5.base-module.gradle.kts

@@ -0,0 +1,69 @@
+plugins {
+    java
+    `java-library`
+    `maven-publish`
+    id("de.siphalor.tweed5.local-runtime-only")
+}
+
+group = rootProject.group
+version = rootProject.version
+
+java {
+    sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get())
+    targetCompatibility = JavaVersion.toVersion(libs.versions.java.get())
+}
+
+repositories {
+    mavenCentral()
+}
+
+sourceSets {
+    test {
+        runtimeClasspath = main.get().runtimeClasspath
+    }
+}
+
+dependencies {
+    compileOnly(libs.lombok)
+    annotationProcessor(libs.lombok)
+    testCompileOnly(libs.lombok)
+    testAnnotationProcessor(libs.lombok)
+
+    compileOnly(libs.autoservice.annotations)
+    annotationProcessor(libs.autoservice.processor)
+    testCompileOnly(libs.autoservice.annotations)
+    testAnnotationProcessor(libs.autoservice.processor)
+
+    implementation(libs.jetbrains.annotations)
+
+    implementation(libs.slf4j.api)
+    "localRuntimeOnly"(libs.slf4j.rt)
+
+    testImplementation(platform(libs.junit.platform))
+    testImplementation(libs.junit.core)
+    testImplementation(libs.mockito)
+    testImplementation(libs.assertj)
+}
+
+
+tasks.test {
+    useJUnitPlatform()
+    systemProperties(
+        "junit.jupiter.execution.timeout.mode" to "disabled_on_debug",
+        "junit.jupiter.execution.timeout.testable.method.default" to "10s",
+        "junit.jupiter.execution.timeout.thread.mode.default" to "SEPARATE_THREAD",
+    )
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("maven") {
+            groupId = project.group.toString()
+            artifactId = project.name
+            version = project.version.toString()
+
+            from(components["java"])
+        }
+    }
+}
+

buildSrc/src/main/kotlin/de.siphalor.tweed5.local-runtime-only.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("java")
+    java
 }
 
 val localRuntimeOnly = configurations.create("localRuntimeOnly")

gradle.properties

@@ -1,11 +1 @@
 version = 0.1.0
-
-asm.version = 9.7
-jetbrains_annotations.version = 26.0.1
-lombok.version = 1.18.34
-auto_service.version = 1.1.1
-slf4j.version = 2.0.16
-
-junit.version = 5.11.2
-mockito.version = 5.14.2
-assertj.version = 3.26.3

gradle/libs.versions.toml

@@ -0,0 +1,24 @@
+[versions]
+assertj = "3.26.3"
+asm = "9.7"
+autoservice = "1.1.1"
+java = "8"
+jetbrains-annotations = "26.0.1"
+junit = "5.11.2"
+lombok = "1.18.34"
+mockito = "5.14.2"
+slf4j = "2.0.16"
+
+[libraries]
+assertj = { group = "org.assertj", name = "assertj-core", version.ref = "assertj" }
+asm-commons = { group = "org.ow2.asm", name = "asm-commons", version.ref = "asm" }
+asm-core = { group = "org.ow2.asm", name = "asm", version.ref = "asm" }
+autoservice-annotations = { group = "com.google.auto.service", name = "auto-service-annotations", version.ref = "autoservice" }
+autoservice-processor = { group = "com.google.auto.service", name = "auto-service", version.ref = "autoservice" }
+jetbrains-annotations = { group = "org.jetbrains", name = "annotations", version.ref = "jetbrains-annotations" }
+junit-platform = { group = "org.junit", name = "junit-bom", version.ref = "junit" }
+junit-core = { group = "org.junit.jupiter", name = "junit-jupiter" }
+lombok = { group = "org.projectlombok", name = "lombok", version.ref = "lombok" }
+mockito = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" }
+slf4j-api = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" }
+slf4j-rt = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
-#Sun Apr 14 17:59:04 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +82,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# This is normally unused
-
+# shellcheck disable=SC2034
-APP_NAME="Gradle"
 APP_BASE_NAME=${0##*/}
-
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +133,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,11 +200,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
+
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-#     shell script including quotes and variable substitutions, so put them in
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-#     double quotes to make sure that they get re-expanded; and
+
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -205,6 +216,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -13,8 +13,10 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +27,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+set EXIT_CODE=%ERRORLEVEL%
-exit /b 1
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

tweed5-core/build.gradle.kts

@@ -1,3 +1,7 @@
+plugins {
+    id("de.siphalor.tweed5.base-module")
+}
+
 dependencies {
     api(project(":tweed5-patchwork"))
     api(project(":tweed5-utils"))

tweed5-default-extensions/build.gradle.kts

@@ -1,3 +1,7 @@
+plugins {
+    id("de.siphalor.tweed5.base-module")
+}
+
 dependencies {
     api(project(":tweed5-core"))
     api(project(":tweed5-serde-extension"))

tweed5-naming-format/build.gradle.kts

@@ -0,0 +1,3 @@
+plugins {
+    id("de.siphalor.tweed5.base-module")
+}

tweed5-patchwork/build.gradle.kts

@@ -1,4 +1,8 @@
-dependencies {
+plugins {
-    implementation("org.ow2.asm:asm:${properties["asm.version"]}")
+    id("de.siphalor.tweed5.base-module")
-    implementation("org.ow2.asm:asm-commons:${properties["asm.version"]}")
+}
+
+dependencies {
+    implementation(libs.asm.core)
+    implementation(libs.asm.commons)
 }

tweed5-serde-api/build.gradle.kts

@@ -0,0 +1,3 @@
+plugins {
+    id("de.siphalor.tweed5.base-module")
+}

tweed5-serde-extension/build.gradle.kts

@@ -1,3 +1,7 @@
+plugins {
+    id("de.siphalor.tweed5.base-module")
+}
+
 dependencies {
     api(project(":tweed5-core"))
     api(project(":tweed5-patchwork"))

tweed5-serde-hjson/build.gradle.kts

@@ -1,3 +1,7 @@
+plugins {
+    id("de.siphalor.tweed5.base-module")
+}
+
 dependencies {
     api(project(":tweed5-serde-api"))
 }

tweed5-utils/build.gradle.kts

@@ -0,0 +1,3 @@
+plugins {
+    id("de.siphalor.tweed5.base-module")
+}

tweed5-weaver-pojo-serde-extension/build.gradle.kts

@@ -1,3 +1,7 @@
+plugins {
+    id("de.siphalor.tweed5.base-module")
+}
+
 dependencies {
     api(project(":tweed5-weaver-pojo"))
     api(project(":tweed5-serde-extension"))

tweed5-weaver-pojo/build.gradle.kts

@@ -1,3 +1,7 @@
+plugins {
+    id("de.siphalor.tweed5.base-module")
+}
+
 dependencies {
     api(project(":tweed5-core"))
     api(project(":tweed5-naming-format"))