Set minimum JDK version for -release flag to java 17

Author: jchyb

community-build/src/scala/dotty/communitybuild/projects.scala

@@ -127,6 +127,11 @@ object projects:
       s""";set $project/Compile/doc/sources ++= ($project/Compile/doc/dotty.tools.sbtplugin.DottyPlugin.autoImport.tastyFiles).value ;$project/doc"""
     ).mkString(" ")
 
+  private def removeRelease8(projects: String*): String =
+    projects.map(project =>
+      s"""set $project/Compile/scalacOptions := ($project/Compile/scalacOptions).value.filterNot(opt => opt == "-release" || opt == "8")"""
+    ).mkString("; ")
+
   private def aggregateDoc(in: String)(projects: String*) =
     val tastyFiles =
       (in +: projects).map(p => s"($p/Compile/doc/dotty.tools.sbtplugin.DottyPlugin.autoImport.tastyFiles).value").mkString(" ++ ")
@@ -445,7 +450,10 @@ object projects:
 
   lazy val discipline = SbtCommunityProject(
     project = "discipline",
-    sbtTestCommand = "coreJVM/test;coreJS/test",
+    sbtTestCommand = List(
+      removeRelease8("core.jvm", "core.js"),
+      "coreJVM/test;coreJS/test"
+    ).mkString("; "),
     sbtPublishCommand = "set every credentials := Nil;coreJVM/publishLocal;coreJS/publishLocal",
     scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Wsafe-init"),
   )
@@ -621,11 +629,10 @@ object projects:
   lazy val fs2 = SbtCommunityProject(
     project = "fs2",
     sbtTestCommand =
-      val subprojects = List("coreJVM", "coreJS")
       List(
-        subprojects.map(name => s"""set $name/Compile/scalacOptions := ($name/Compile/scalacOptions).value.filterNot(opt => opt == "-release" || opt == "8")"""),
-        List("coreJVM/test; coreJS/test;")
-      ).flatten.mkString("; "),
+        removeRelease8("coreJVM", "coreJS"),
+        "coreJVM/test; coreJS/test;"
+      ).mkString("; "),
     sbtPublishCommand = "coreJVM/publishLocal; coreJS/publishLocal",
     scalacOptions = SbtCommunityProject.scalacOptions.filter(_ != "-Wsafe-init"),
   )

compiler/src/dotty/tools/dotc/config/ScalaSettingsProperties.scala

@@ -10,15 +10,17 @@ object ScalaSettingsProperties:
   private lazy val minTargetVersion = classfileVersionMap.keysIterator.min
   private lazy val maxTargetVersion = classfileVersionMap.keysIterator.max
 
+  private val minReleaseVersion = 17
+
   def supportedTargetVersions: List[String] =
     (minTargetVersion to maxTargetVersion).toList.map(_.toString)
 
   def supportedReleaseVersions: List[String] =
     if scala.util.Properties.isJavaAtLeast("9") then
       val jdkVersion = JDK9Reflectors.runtimeVersionMajor(JDK9Reflectors.runtimeVersion()).intValue()
       val maxVersion = Math.min(jdkVersion, maxTargetVersion)
-      (minTargetVersion to maxVersion).toList.map(_.toString)
-    else List(minTargetVersion).map(_.toString)
+      (minReleaseVersion to maxVersion).toList.map(_.toString)
+    else List(minReleaseVersion).map(_.toString)
 
   def supportedScalaReleaseVersions: List[String] =
     ScalaRelease.values.toList.map(_.show)

presentation-compiler/test/dotty/tools/pc/tests/completion/CompletionRelease8Suite.scala

@@ -4,10 +4,11 @@ import dotty.tools.pc.base.BaseCompletionSuite
 
 import org.junit.Test
 import org.junit.Before
+import org.junit.Ignore
 import java.nio.file.Path
 import dotty.tools.pc.utils.JRE
 
-class CompletionRelease8Suite extends BaseCompletionSuite:
+@Ignore class CompletionRelease8Suite extends BaseCompletionSuite:
 
   override protected def scalacOptions(classpath: Seq[Path]): Seq[String] =
     "-release:8" +: super.scalacOptions(classpath)

sbt-test/sbt-dotty/scaladoc-regressions/build.sbt

@@ -6,4 +6,4 @@ lazy val i20476 = project
 
 lazy val i18231 = project
   .in(file("i18231"))
-  .settings(scalacOptions += "-release:8")
+  // .settings(scalacOptions += "-release:8")