Merge remote-tracking branch 'origin/migrate-to-new-toml-project-stru…

…cture' into develop

build.gradle

@@ -1,35 +1,31 @@
-group = "$groupPackage" as Object
-version = "$projectVersion" as Object
-description = "$rootProject.name"
-
 buildscript {
     repositories {
         maven {
-            url "https://plugins.gradle.org/m2/"
+            url projectRepositoriesMavenUrl
         }
     }
-    dependencies {
-        classpath "io.freefair.gradle:lombok-plugin:$gradlePluginLombokVersion"
-        classpath "com.github.ben-manes:gradle-versions-plugin:$gradlePluginVersionsVersion"
-        classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:$licenseGradlePluginVersion"
-        classpath "com.bmuschko:gradle-izpack-plugin:$gradleIzpackPluginVersion"
-        classpath "org.ajoberstar.grgit:grgit-gradle:$grgitGradlePluginVersion"
-        classpath "com.diffplug.spotless:spotless-plugin-gradle:$spotlessGradlePluginVersion"
-    }
 }
 
-apply plugin: "io.freefair.lombok"
-apply plugin: "java"
-apply plugin: "com.bmuschko.izpack"
-apply plugin: "idea"
-apply plugin: "java-library"
-apply plugin: "maven-publish"
-apply plugin: "signing"
-apply plugin: "com.github.ben-manes.versions"
-apply plugin: "com.github.hierynomus.license"
-apply plugin: "jacoco"
-apply plugin: "org.ajoberstar.grgit"
-apply plugin: "com.diffplug.spotless"
+plugins {
+    id 'java'
+    id 'idea'
+    id 'java-library'
+    id 'maven-publish'
+    id 'signing'
+    id 'jacoco'
+    alias(libs.plugins.lombok.plugin)
+    alias(libs.plugins.gradle.versions.plugin)
+    alias(libs.plugins.license.gradle.plugin)
+    alias(libs.plugins.gradle.izpack.plugin)
+    alias(libs.plugins.grgit.gradle)
+    alias(libs.plugins.spotless.plugin.gradle)
+    alias(libs.plugins.version.catalog.update)
+}
+
+group = "$groupPackage" as Object
+version = "$projectVersion" as Object
+description = "$rootProject.name"
+
 // import gradle files
 apply from: "gradle/dependencies.gradle"
 apply from: "gradle/formatting.gradle"
@@ -40,15 +36,23 @@ apply from: "gradle/packaging.gradle"
 apply from: "gradle/publishing.gradle"
 apply from: "gradle/repositories.gradle"
 apply from: "gradle/testing.gradle"
+apply from: "gradle/version-catalog-update.gradle"
 
 java {
     sourceCompatibility = "$projectSourceCompatibility" as Object
+    toolchain {
+        languageVersion = JavaLanguageVersion.of("$projectSourceCompatibility")
+    }
 }
 
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach { javaCompiler ->
     options.encoding = "UTF-8"
     // uncomment the next line for build with compiler argument -Xlint:deprecation
     // options.compilerArgs << "-Xlint:deprecation"
     // uncomment the next line for build with compiler argument -Xlint:unchecked
     // options.compilerArgs << "-Xlint:unchecked"
 }
+
+tasks.named("test") {
+    it.mustRunAfter(tasks.named("jar"))
+}