From c82fd4534e381ad1f55a9c121c0ca3aa5056dc25 Mon Sep 17 00:00:00 2001
From: Josh Cummings <3627351+jzheaux@users.noreply.github.com>
Date: Fri, 22 Nov 2024 10:13:19 -0700
Subject: [PATCH] Update to Gradle 8.10.2

Issue gh-933
---
 .../gradle/convention/AbstractSpringJavaPlugin.groovy     | 8 ++++++++
 .../gradle/convention/TestsConfigurationPlugin.groovy     | 2 +-
 gradle/wrapper/gradle-wrapper.properties                  | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy
index a927e4fa..27a9fac8 100644
--- a/buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy
+++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy
@@ -65,8 +65,16 @@ public abstract class AbstractSpringJavaPlugin implements Plugin<Project> {
         project.test {
             useJUnitPlatform()
         }
+		project.java.sourceCompatibility = toolchainVersion(project)
 		additionalPlugins(project);
 	}
 
 	protected abstract void additionalPlugins(Project project);
+
+	private Integer toolchainVersion(Project project) {
+		if (project.hasProperty("testToolchain")) {
+			return project.property("testToolchain").toString().toInteger();
+		}
+		return 17;
+	}
 }
diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/TestsConfigurationPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/TestsConfigurationPlugin.groovy
index 99aac80a..8d2fffd4 100644
--- a/buildSrc/src/main/groovy/io/spring/gradle/convention/TestsConfigurationPlugin.groovy
+++ b/buildSrc/src/main/groovy/io/spring/gradle/convention/TestsConfigurationPlugin.groovy
@@ -43,7 +43,7 @@ public class TestsConfigurationPlugin implements Plugin<Project> {
 		}
 
 		project.tasks.create('testJar', Jar) {
-			classifier = 'test'
+			archiveClassifier = 'test'
 			from project.sourceSets.test.output
 		}
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 98debb84..1e2fbf0d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists