From 74ea1f9448b81f8bc401527509addcf4a01e8eee Mon Sep 17 00:00:00 2001
From: marko-bekhta <marko.prykladna@gmail.com>
Date: Tue, 7 Oct 2025 21:52:29 +0200
Subject: [PATCH] [#2616] Update to Gradle 9.1

---
 gradle/wrapper/gradle-wrapper.properties            |  2 +-
 gradlew                                             |  3 +--
 .../src/main/groovy/hr-java-library.gradle          | 13 +++++++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cea7a793a..2e1113280 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.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f5feea6d6..f3b75f3b0 100755
--- a/gradlew
+++ b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/local-build-plugins/src/main/groovy/hr-java-library.gradle b/local-build-plugins/src/main/groovy/hr-java-library.gradle
index 4f372fe21..d9a448ed9 100644
--- a/local-build-plugins/src/main/groovy/hr-java-library.gradle
+++ b/local-build-plugins/src/main/groovy/hr-java-library.gradle
@@ -33,6 +33,13 @@ repositories {
 	mavenCentral()
 }
 
+dependencies {
+	// JUnit Jupiter
+	testImplementation(libs.org.junit.jupiter.junit.jupiter.api)
+	testRuntimeOnly(libs.org.junit.jupiter.junit.jupiter.engine)
+	testRuntimeOnly(libs.org.junit.platform.junit.platform.launcher)
+}
+
 ext.publishScript = rootProject.rootDir.absolutePath + '/publish.gradle'
 
 tasks.withType( JavaCompile ).configureEach {
@@ -46,8 +53,10 @@ tasks.withType( Test ).configureEach {
 }
 
 if ( !gradle.ext.javaToolchainEnabled ) {
-	sourceCompatibility = JavaVersion.toVersion( gradle.ext.baselineJavaVersion )
-	targetCompatibility = JavaVersion.toVersion( gradle.ext.baselineJavaVersion )
+	java {
+		sourceCompatibility = JavaVersion.toVersion( gradle.ext.baselineJavaVersion )
+		targetCompatibility = JavaVersion.toVersion( gradle.ext.baselineJavaVersion )
+	}
 }
 else {
 	// Configure generated bytecode