From a62dd22f83690d2c051d5a8543a6e42f60675b3f Mon Sep 17 00:00:00 2001
From: Karl Tauber <karl@jformdesigner.com>
Date: Sat, 23 Mar 2024 13:46:51 +0100
Subject: [PATCH] Gradle: fixed warning regarding using deprecation Gradle
 features, making it incompatible with Gradle 9.0

---
 flatlaf-core/build.gradle.kts                          |  4 ++--
 flatlaf-fonts/flatlaf-fonts-inter/build.gradle.kts     |  4 ++--
 .../flatlaf-fonts-jetbrains-mono/build.gradle.kts      |  4 ++--
 .../flatlaf-fonts-roboto-mono/build.gradle.kts         |  4 ++--
 flatlaf-fonts/flatlaf-fonts-roboto/build.gradle.kts    |  4 ++--
 gradle/libs.versions.toml                              | 10 +++-------
 6 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/flatlaf-core/build.gradle.kts b/flatlaf-core/build.gradle.kts
index ed247419..dab5d3bf 100644
--- a/flatlaf-core/build.gradle.kts
+++ b/flatlaf-core/build.gradle.kts
@@ -27,8 +27,8 @@ plugins {
 val sigtest = configurations.create( "sigtest" )
 
 dependencies {
-	testImplementation( libs.bundles.junit )
-	testRuntimeOnly( libs.junit.engine )
+	testImplementation( libs.junit )
+	testRuntimeOnly( libs.junit.launcher )
 
 	// https://github.com/jtulach/netbeans-apitest
 	sigtest( libs.sigtest )
diff --git a/flatlaf-fonts/flatlaf-fonts-inter/build.gradle.kts b/flatlaf-fonts/flatlaf-fonts-inter/build.gradle.kts
index 9cc431f3..51c8b322 100644
--- a/flatlaf-fonts/flatlaf-fonts-inter/build.gradle.kts
+++ b/flatlaf-fonts/flatlaf-fonts-inter/build.gradle.kts
@@ -33,8 +33,8 @@ plugins {
 dependencies {
 	implementation( project( ":flatlaf-core" ) )
 
-	testImplementation( libs.bundles.junit )
-	testRuntimeOnly( libs.junit.engine )
+	testImplementation( libs.junit )
+	testRuntimeOnly( libs.junit.launcher )
 }
 
 flatlafModuleInfo {
diff --git a/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/build.gradle.kts b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/build.gradle.kts
index 7fbfb1f9..492eb2fa 100644
--- a/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/build.gradle.kts
+++ b/flatlaf-fonts/flatlaf-fonts-jetbrains-mono/build.gradle.kts
@@ -33,8 +33,8 @@ plugins {
 dependencies {
 	implementation( project( ":flatlaf-core" ) )
 
-	testImplementation( libs.bundles.junit )
-	testRuntimeOnly( libs.junit.engine )
+	testImplementation( libs.junit )
+	testRuntimeOnly( libs.junit.launcher )
 }
 
 flatlafModuleInfo {
diff --git a/flatlaf-fonts/flatlaf-fonts-roboto-mono/build.gradle.kts b/flatlaf-fonts/flatlaf-fonts-roboto-mono/build.gradle.kts
index b0fc7853..90d9a4e9 100644
--- a/flatlaf-fonts/flatlaf-fonts-roboto-mono/build.gradle.kts
+++ b/flatlaf-fonts/flatlaf-fonts-roboto-mono/build.gradle.kts
@@ -33,8 +33,8 @@ plugins {
 dependencies {
 	implementation( project( ":flatlaf-core" ) )
 
-	testImplementation( libs.bundles.junit )
-	testRuntimeOnly( libs.junit.engine )
+	testImplementation( libs.junit )
+	testRuntimeOnly( libs.junit.launcher )
 }
 
 flatlafModuleInfo {
diff --git a/flatlaf-fonts/flatlaf-fonts-roboto/build.gradle.kts b/flatlaf-fonts/flatlaf-fonts-roboto/build.gradle.kts
index 739bc357..187004a8 100644
--- a/flatlaf-fonts/flatlaf-fonts-roboto/build.gradle.kts
+++ b/flatlaf-fonts/flatlaf-fonts-roboto/build.gradle.kts
@@ -33,8 +33,8 @@ plugins {
 dependencies {
 	implementation( project( ":flatlaf-core" ) )
 
-	testImplementation( libs.bundles.junit )
-	testRuntimeOnly( libs.junit.engine )
+	testImplementation( libs.junit )
+	testRuntimeOnly( libs.junit.launcher )
 }
 
 flatlafModuleInfo {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 79bb4b08..37a754be 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@
 #
 
 [versions]
-junit = "5.10.0"
+junit = "5.10.2"
 
 
 [libraries]
@@ -50,16 +50,12 @@ jna = "net.java.dev.jna:jna:5.12.1"
 jna-platform = "net.java.dev.jna:jna-platform:5.12.1"
 
 # junit
-junit-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
-junit-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit" }
-junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
+junit = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
+junit-launcher = { module = "org.junit.platform:junit-platform-launcher" }
 
 # errorprone
 errorprone = "com.google.errorprone:error_prone_core:2.20.0"
 
 
-[bundles]
-junit = [ "junit-api", "junit-params" ]
-
 [plugins]
 errorprone = { id = "net.ltgt.errorprone", version = "3.1.0" }