diff --git a/project/ScalaOptionParser.scala b/project/ScalaOptionParser.scala
index f2cc8b725e1f..89d11246b11f 100644
--- a/project/ScalaOptionParser.scala
+++ b/project/ScalaOptionParser.scala
@@ -140,5 +140,5 @@ object ScalaOptionParser {
private def scaladocPathSettingNames = List("-doc-root-content", "-diagrams-dot-path")
private def scaladocMultiStringSettingNames = List("-doc-external-doc")
- private val targetSettingNames = (8 to 18).map(_.toString).flatMap(v => v :: s"jvm-1.$v" :: s"jvm-$v" :: s"1.$v" :: Nil).toList
+ private val targetSettingNames = (8 to 19).map(_.toString).flatMap(v => v :: s"jvm-1.$v" :: s"jvm-$v" :: s"1.$v" :: Nil).toList
}
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/analysis/BackendUtils.scala b/src/compiler/scala/tools/nsc/backend/jvm/analysis/BackendUtils.scala
index a4463b7f166c..05444337a241 100644
--- a/src/compiler/scala/tools/nsc/backend/jvm/analysis/BackendUtils.scala
+++ b/src/compiler/scala/tools/nsc/backend/jvm/analysis/BackendUtils.scala
@@ -82,6 +82,7 @@ abstract class BackendUtils extends PerRunInit {
case "16" => asm.Opcodes.V16
case "17" => asm.Opcodes.V17
case "18" => asm.Opcodes.V18
+ case "19" => asm.Opcodes.V19
// to be continued...
})
diff --git a/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
index 15527257a3b5..615bd0059595 100644
--- a/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
+++ b/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
@@ -73,7 +73,7 @@ trait StandardScalaSettings { _: MutableSettings =>
object StandardScalaSettings {
// not final in case some separately compiled client code wanted to depend on updated values
val MinTargetVersion = 8
- val MaxTargetVersion = 18
+ val MaxTargetVersion = 19
private val AllTargetVersions = (MinTargetVersion to MaxTargetVersion).map(_.toString).to(List)
}
diff --git a/src/intellij/scala.ipr.SAMPLE b/src/intellij/scala.ipr.SAMPLE
index e4ef852eb0c5..7d917aa7f815 100644
--- a/src/intellij/scala.ipr.SAMPLE
+++ b/src/intellij/scala.ipr.SAMPLE
@@ -232,7 +232,7 @@
-
+
@@ -243,7 +243,7 @@
-
+
@@ -252,7 +252,7 @@
-
+
@@ -266,7 +266,7 @@
-
+
@@ -287,7 +287,7 @@
-
+
@@ -296,14 +296,14 @@
-
+
-
+
@@ -312,7 +312,7 @@
-
+
@@ -448,7 +448,7 @@
-
+
@@ -457,7 +457,7 @@
-
+
@@ -467,7 +467,7 @@
-
+
@@ -498,7 +498,7 @@
-
+
@@ -514,7 +514,7 @@
-
+
@@ -525,7 +525,7 @@
-
+
diff --git a/test/junit/scala/tools/nsc/settings/TargetTest.scala b/test/junit/scala/tools/nsc/settings/TargetTest.scala
index 4925ed6a56fe..03d3acf90c47 100644
--- a/test/junit/scala/tools/nsc/settings/TargetTest.scala
+++ b/test/junit/scala/tools/nsc/settings/TargetTest.scala
@@ -68,8 +68,12 @@ class TargetTest {
check("-target:jvm-18", "18")
check("-target:18", "18")
+ check("-target:jvm-19", "19")
+ check("-target:19", "19")
+
checkFail("-target:jvm-6") // no longer
- checkFail("-target:jvm-19") // not yet...
+ checkFail("-target:jvm-7") // no longer
+ checkFail("-target:jvm-20") // not yet...
checkFail("-target:jvm-3000") // not in our lifetime
checkFail("-target:msil") // really?
diff --git a/versions.properties b/versions.properties
index 002028a75757..71d1e1a92e2d 100644
--- a/versions.properties
+++ b/versions.properties
@@ -6,7 +6,7 @@ starr.version=2.13.8
# - scala-compiler: jline (% "optional")
# Other usages:
# - scala-asm: jar content included in scala-compiler
-scala-asm.version=9.2.0-scala-1
+scala-asm.version=9.3.0-scala-1
# jna.version must be updated together with jline-terminal-jna
jline.version=3.21.0