Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Set up CI with JDK 18

Browse Source 
Closes gh-30104
This commit is contained in:
Andy Wilkinson
2022-03-09 09:14:23 +00:00
parent 429167e71f
commit 20d21d4e58
14 changed files with 127 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleCompatibilityExtension.java
View File

@@ -47,7 +47,10 @@ final class GradleCompatibilityExtension implements TestTemplateInvocationContex
static {
JavaVersion javaVersion = JavaVersion.current();
if (javaVersion.isCompatibleWith(JavaVersion.VERSION_17)) {
if (javaVersion.isCompatibleWith(JavaVersion.VERSION_HIGHER)) {
GRADLE_VERSIONS = Arrays.asList("7.3.3", "7.4");
}
else if (javaVersion.isCompatibleWith(JavaVersion.VERSION_17)) {
GRADLE_VERSIONS = Arrays.asList("7.2", "7.3.3", "7.4");
}
else if (javaVersion.isCompatibleWith(JavaVersion.VERSION_16)) {

6
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/junit/GradleProjectBuilder.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ import org.springframework.util.StringUtils;
/**
* Helper class to build Gradle {@link Project Projects} for test fixtures. Wraps
* functionality of Gradle's own {@link ProjectBuilder} in order to workaround an issue on
* JDK 17.
* JDK 17 and 18.
*
* @author Christoph Dreis
* @see <a href="https://github.com/gradle/gradle/issues/16857">Gradle Support JDK 17</a>
@@ -67,7 +67,7 @@ public final class GradleProjectBuilder {
if (StringUtils.hasText(this.name)) {
builder.withName(this.name);
}
if (JavaVersion.current() == JavaVersion.VERSION_17) {
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
NativeServices.initialize(userHome);
try {
ProjectBuilderImpl.getGlobalServices();