From acd2925667ac1dae317b3b2de03ce2d3b5da2205 Mon Sep 17 00:00:00 2001
From: daz <daz@gradle.com>
Date: Tue, 25 Mar 2025 15:25:09 -0600
Subject: [PATCH] Update java-toolchain sample to use Kotlin DSL

---
 .../{build.gradle => build.gradle.kts}               | 12 ++++++++----
 .../workflow-samples/java-toolchain/settings.gradle  |  5 -----
 .../java-toolchain/settings.gradle.kts               |  6 ++++++
 3 files changed, 14 insertions(+), 9 deletions(-)
 rename .github/workflow-samples/java-toolchain/{build.gradle => build.gradle.kts} (52%)
 delete mode 100644 .github/workflow-samples/java-toolchain/settings.gradle
 create mode 100644 .github/workflow-samples/java-toolchain/settings.gradle.kts

diff --git a/.github/workflow-samples/java-toolchain/build.gradle b/.github/workflow-samples/java-toolchain/build.gradle.kts
similarity index 52%
rename from .github/workflow-samples/java-toolchain/build.gradle
rename to .github/workflow-samples/java-toolchain/build.gradle.kts
index 132b9028..0f2982ce 100644
--- a/.github/workflow-samples/java-toolchain/build.gradle
+++ b/.github/workflow-samples/java-toolchain/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id 'java'
+    java
 }
 
 java {
@@ -12,6 +12,10 @@ repositories {
     mavenCentral()
 }
 
-dependencies {
-    testImplementation('junit:junit:4.13.2')
-}
\ No newline at end of file
+testing {
+    suites {
+        val test by getting(JvmTestSuite::class) {
+            useJUnit()
+        }
+    }
+}
diff --git a/.github/workflow-samples/java-toolchain/settings.gradle b/.github/workflow-samples/java-toolchain/settings.gradle
deleted file mode 100644
index db4285e9..00000000
--- a/.github/workflow-samples/java-toolchain/settings.gradle
+++ /dev/null
@@ -1,5 +0,0 @@
-plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version("0.7.0")
-}
-
-rootProject.name = 'basic'
diff --git a/.github/workflow-samples/java-toolchain/settings.gradle.kts b/.github/workflow-samples/java-toolchain/settings.gradle.kts
new file mode 100644
index 00000000..bf2b4a0e
--- /dev/null
+++ b/.github/workflow-samples/java-toolchain/settings.gradle.kts
@@ -0,0 +1,6 @@
+plugins {
+    // Apply the foojay-resolver plugin to allow automatic download of JDKs
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
+}
+
+rootProject.name = "java-toolchains"