Partest uses -release 8

scala · Jun 9, 2022 · 2d26b75 · 2d26b75
1 parent f33a40e
commit 2d26b75
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/partest/scala/tools/partest/nest/Runner.scala b/src/partest/scala/tools/partest/nest/Runner.scala
@@ -453,10 +453,12 @@ class Runner(val testInfo: TestInfo, val suiteRunner: AbstractRunner) {
   }
 
   // all sources in a round may contribute flags via // scalac: -flags
+  // if a javaVersion isn't specified, require the minimum viable using -release 8 to avoid gotcha in CI.
   def flagsForCompilation(sources: List[File]): List[String] = {
-    val perFile = toolArgsFor(sources)("scalac")
-    if (parentFile.getParentFile.getName == "macro-annot") "-Ymacro-annotations" :: perFile
-    else perFile
+    var perFile = toolArgsFor(sources)("scalac")
+    if (parentFile.getParentFile.getName == "macro-annot") perFile ::= "-Ymacro-annotations"
+    if (toolArgsFor(sources)("javaVersion", split = false).isEmpty) perFile :::= List("-release", "8")
+    perFile
   }
 
   // inspect sources for tool args

diff --git a/test/files/neg/nonunit-statement.scala b/test/files/neg/nonunit-statement.scala
@@ -156,6 +156,7 @@ class J {
   import java.util.Collections
   def xs: java.util.List[Int] = ???
   def f(): Int = {
+    java.util.List.of[Int]()
     Collections.checkedList[Int](xs, classOf[Int])
     42
   }