fix JavaCompilerSpec with JDK 21

sbt · Oct 8, 2023 · b6ce9ab · b6ce9ab
1 parent 3f5e423
commit b6ce9ab
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavaCompilerSpec.scala b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavaCompilerSpec.scala
@@ -98,8 +98,15 @@ class JavaCompilerSpec extends UnitSpec with Diagrams {
   }
 
   def findsErrors(compiler: XJavaTools) = IO.withTemporaryDirectory { out =>
+    val options = Seq("-deprecation") ++ {
+      if (scala.util.Properties.isJavaAtLeast("21")) {
+        Seq("-proc:none")
+      } else {
+        Nil
+      }
+    }
     val (result, problems) =
-      compile(compiler, Seq(knownSampleErrorFile), Seq("-deprecation"), out.toPath)
+      compile(compiler, Seq(knownSampleErrorFile), options, out.toPath)
     assert(result == false)
     assert(problems.size == {
       sys.props("java.specification.version") match {
@@ -226,10 +233,18 @@ class JavaCompilerSpec extends UnitSpec with Diagrams {
   }
 
   def forkSameAsLocal() = IO.withTemporaryDirectory { out =>
+    val options = Seq("-deprecation") ++ {
+      if (scala.util.Properties.isJavaAtLeast("21")) {
+        Seq("-proc:none")
+      } else {
+        Nil
+      }
+    }
+
     val (fresult, fproblems) =
-      compile(forked, Seq(knownSampleErrorFile), Seq("-deprecation"), out.toPath)
+      compile(forked, Seq(knownSampleErrorFile), options, out.toPath)
     val (lresult, lproblems) =
-      compile(local, Seq(knownSampleErrorFile), Seq("-deprecation"), out.toPath)
+      compile(local, Seq(knownSampleErrorFile), options, out.toPath)
     assert(fresult == lresult)
 
     (fproblems zip lproblems) foreach {