8 for Java 8 and 11 for Java 11.
+ * @return the JVM version such as 11 for Java 11 and 17 for Java 17.
*/
public static OptionalThe bootclasspath is normal jar files on disk that can live under $JAVA_HOME.
- */
- private void indexBootstrapClasspath() throws IOException {
- for (Object keyObject : System.getProperties().keySet()) {
- Package jdk = new JdkPackage("8");
- if (!(keyObject instanceof String)) continue;
- String key = (String) keyObject;
- if (!key.endsWith(".boot.class.path")) continue;
- String value = System.getProperty(key);
- for (String entry : value.split(File.pathSeparator)) {
- Path path = Paths.get(entry);
- if (JAR_PATTERN.matches(path) && Files.isRegularFile(path)) {
- indexJarFile(path, jdk);
- }
- }
- }
- }
}
diff --git a/tests/buildTools/src/test/resources/example-maven-pom.xml b/tests/buildTools/src/test/resources/example-maven-pom.xml
index 611c30cf9..a1c3848ec 100644
--- a/tests/buildTools/src/test/resources/example-maven-pom.xml
+++ b/tests/buildTools/src/test/resources/example-maven-pom.xml
@@ -14,8 +14,8 @@
@message
- |/conf/routes
- |GET / controllers.HomeController.index
- |""".stripMargin,
- expectedSemanticdbFiles =
- 2, // Two files because `conf/routes` generates a Java file.
- gradleVersions = List(Gradle6)
- )
-
- checkGradleBuild(
- "checkerframework".tag(Java8Only),
- """|/build.gradle
- |plugins {
- | id 'java'
- | id 'org.checkerframework' version '0.5.24'
- |}
- |repositories {
- | mavenCentral()
- |}
- |java {
- | toolchain {
- | languageVersion = JavaLanguageVersion.of(8)
- | }
- |}
- |/src/main/java/foo/Example.java
- |package foo;
- |public class Example {}
- |/src/test/java/foo/ExampleSuite.java
- |package foo;
- |public class ExampleSuite {}
- |""".stripMargin,
- expectedSemanticdbFiles = 2,
- gradleVersions = List(Gradle6)
- )
-
checkGradleBuild(
s"scala",
"""|/build.gradle
@@ -430,7 +349,7 @@ abstract class GradleBuildToolSuite(gradle: Tool.Gradle)
gradleVersions = List(Gradle8, Gradle7, Gradle6)
)
- List("8", "11").foreach { java =>
+ List("11", "17").foreach { java =>
checkGradleBuild(
s"kotlin-jvm-toolchains-jdk$java",
s"""|/build.gradle
diff --git a/tests/buildTools/src/test/scala/tests/Tool.scala b/tests/buildTools/src/test/scala/tests/Tool.scala
index 2d689f0be..6868d4b8a 100644
--- a/tests/buildTools/src/test/scala/tests/Tool.scala
+++ b/tests/buildTools/src/test/scala/tests/Tool.scala
@@ -6,8 +6,8 @@ case class JVMSupport(minJava: Int, maxJava: Option[Int] = None) {
(maxJava.isEmpty || maxJava.exists(javaVersion <= _))
}
object JVMSupport {
- val noRestrictions = JVMSupport(8, None)
- def atMostJava(j: Int) = JVMSupport(8, Some(j))
+ val noRestrictions = JVMSupport(11, None)
+ def atMostJava(j: Int) = JVMSupport(11, Some(j))
def atLeastJava(j: Int) = JVMSupport(j, None)
def javaBetween(min: Int, max: Int) = JVMSupport(min, Some(max))
@@ -28,7 +28,7 @@ object Tool {
def minimumSupportedJdk(tools: Seq[Tool]): Int = tools
.map(_.support.minJava)
.minOption
- .getOrElse(8)
+ .getOrElse(11)
def maximumSupportedJdk(tools: Seq[Tool]): Option[Int] =
tools.flatMap(_.support.maxJava).minOption
diff --git a/tests/unit/src/test/scala/tests/JavaVersionSuite.scala b/tests/unit/src/test/scala/tests/JavaVersionSuite.scala
index 013cadccc..bbebc265f 100644
--- a/tests/unit/src/test/scala/tests/JavaVersionSuite.scala
+++ b/tests/unit/src/test/scala/tests/JavaVersionSuite.scala
@@ -12,7 +12,7 @@ class JavaVersionSuite extends FunSuite {
}
}
- checkVersion("1.8.0_272", "8")
checkVersion("11.0.9", "11")
+ checkVersion("17.0.5", "17")
}