Skip to content

Commit 5b8f2f7

Browse files
committed
Support Building Against a Different JDK Version
Can use -PtestToolchain=17 to test the compatibility against JDK 17
1 parent 05422b2 commit 5b8f2f7

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,16 @@ public abstract class AbstractSpringJavaPlugin implements Plugin<Project> {
6565
project.test {
6666
useJUnitPlatform()
6767
}
68+
project.java.sourceCompatibility = toolchainVersion(project)
6869
additionalPlugins(project);
6970
}
7071

7172
protected abstract void additionalPlugins(Project project);
73+
74+
private Integer toolchainVersion(Project project) {
75+
if (project.hasProperty("testToolchain")) {
76+
return project.property("testToolchain").toString().toInteger();
77+
}
78+
return 17;
79+
}
7280
}

buildSrc/src/main/groovy/io/spring/gradle/convention/SpringModulePlugin.groovy

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ class SpringModulePlugin extends AbstractSpringJavaPlugin {
4040
if (!Utils.isRelease(project)) {
4141
deployArtifacts.dependsOn project.tasks.artifactoryPublish
4242
}
43-
project.java.sourceCompatibility = JavaVersion.VERSION_17
4443
}
4544

4645
}

buildSrc/src/main/groovy/io/spring/gradle/convention/SpringTestPlugin.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* the License.
1515
*/
1616

17-
package io.spring.gradle.convention;
17+
package io.spring.gradle.convention
1818

19-
import org.gradle.api.Project;
19+
import org.gradle.api.Project
2020

2121
/**
2222
* @author Rob Winch

0 commit comments

Comments
 (0)