From dd530103b6ddf474a6377e65dee4c6f19ce7da94 Mon Sep 17 00:00:00 2001 From: Jean-Luc Deprez Date: Fri, 15 Dec 2023 12:11:19 +0100 Subject: [PATCH] Java 21 & 20 support --- .../scala/com/typesafe/sbteclipse/core/EclipsePlugin.scala | 6 +++++- src/sbt-test/sbteclipse/08-jdt-settings/build.sbt | 2 +- .../08-jdt-settings/e/.settings/org.eclipse.jdt.core.prefs | 6 +++--- src/sbt-test/sbteclipse/08-jdt-settings/e/expected | 6 +++--- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/scala/com/typesafe/sbteclipse/core/EclipsePlugin.scala b/src/main/scala/com/typesafe/sbteclipse/core/EclipsePlugin.scala index 47e039b..67dfe2c 100644 --- a/src/main/scala/com/typesafe/sbteclipse/core/EclipsePlugin.scala +++ b/src/main/scala/com/typesafe/sbteclipse/core/EclipsePlugin.scala @@ -213,6 +213,10 @@ object EclipsePlugin { object EclipseExecutionEnvironment extends Enumeration { + val JavaSE21 = Value("JavaSE-21") + + val JavaSE20 = Value("JavaSE-20") + val JavaSE19 = Value("JavaSE-19") val JavaSE_18 = Value("JavaSE-18") @@ -251,7 +255,7 @@ object EclipsePlugin { val JRE11 = Value("JRE-1.1") - val valueSeq: Seq[Value] = JavaSE19 :: JavaSE_18 :: JavaSE_17 :: JavaSE_16 :: JavaSE15 :: JavaSE14 :: JavaSE13 :: JavaSE12 :: JavaSE11 :: JavaSE10 :: JavaSE9 :: JavaSE18 :: JavaSE17 :: JavaSE16 :: J2SE15 :: J2SE14 :: J2SE13 :: J2SE12 :: JRE11 :: Nil + val valueSeq: Seq[Value] = JavaSE21 :: JavaSE20 :: JavaSE19 :: JavaSE_18 :: JavaSE_17 :: JavaSE_16 :: JavaSE15 :: JavaSE14 :: JavaSE13 :: JavaSE12 :: JavaSE11 :: JavaSE10 :: JavaSE9 :: JavaSE18 :: JavaSE17 :: JavaSE16 :: J2SE15 :: J2SE14 :: J2SE13 :: J2SE12 :: JRE11 :: Nil } sealed trait EclipseClasspathEntry { diff --git a/src/sbt-test/sbteclipse/08-jdt-settings/build.sbt b/src/sbt-test/sbteclipse/08-jdt-settings/build.sbt index 77bcea7..fefab8c 100644 --- a/src/sbt-test/sbteclipse/08-jdt-settings/build.sbt +++ b/src/sbt-test/sbteclipse/08-jdt-settings/build.sbt @@ -72,7 +72,7 @@ lazy val projectD = (project in file("d")) // check that a JDT file is overwritten lazy val projectE = (project in file("e")) .settings( - EclipseKeys.executionEnvironment := Some(EclipseExecutionEnvironment.JavaSE11), + EclipseKeys.executionEnvironment := Some(EclipseExecutionEnvironment.JavaSE21), EclipseKeys.jdtMode := EclipseJDTMode.Overwrite, check ) diff --git a/src/sbt-test/sbteclipse/08-jdt-settings/e/.settings/org.eclipse.jdt.core.prefs b/src/sbt-test/sbteclipse/08-jdt-settings/e/.settings/org.eclipse.jdt.core.prefs index 7fc5c6f..77c6a0f 100644 --- a/src/sbt-test/sbteclipse/08-jdt-settings/e/.settings/org.eclipse.jdt.core.prefs +++ b/src/sbt-test/sbteclipse/08-jdt-settings/e/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.source=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.source=21 +org.eclipse.jdt.core.compiler.compliance=21 dummy.key=abc diff --git a/src/sbt-test/sbteclipse/08-jdt-settings/e/expected b/src/sbt-test/sbteclipse/08-jdt-settings/e/expected index 3bc34e2..76c0ed5 100644 --- a/src/sbt-test/sbteclipse/08-jdt-settings/e/expected +++ b/src/sbt-test/sbteclipse/08-jdt-settings/e/expected @@ -1,3 +1,3 @@ -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.source=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.source=21 +org.eclipse.jdt.core.compiler.compliance=21