Merge pull request #423 from spangaer/oss/java-21

Java 21 & 20 support
sbt · Dec 15, 2023 · 6a4f531 · 6a4f531
2 parents 2873967 + dd53010
commit 6a4f531
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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