diff --git a/project/ScalaOptionParser.scala b/project/ScalaOptionParser.scala
index a9954f61e738..aaa769ddbea6 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 20).map(_.toString).flatMap(v => v :: s"jvm-1.$v" :: s"jvm-$v" :: s"1.$v" :: Nil).toList
+ private val targetSettingNames = (8 to 21).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 a73f1708efcd..75af78a8fc58 100644
--- a/src/compiler/scala/tools/nsc/backend/jvm/analysis/BackendUtils.scala
+++ b/src/compiler/scala/tools/nsc/backend/jvm/analysis/BackendUtils.scala
@@ -84,6 +84,7 @@ abstract class BackendUtils extends PerRunInit {
case "18" => asm.Opcodes.V18
case "19" => asm.Opcodes.V19
case "20" => asm.Opcodes.V20
+ case "21" => asm.Opcodes.V21
// to be continued...
})
diff --git a/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
index 390ccec69062..4b798e0eb52d 100644
--- a/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
+++ b/src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala
@@ -103,7 +103,7 @@ object StandardScalaSettings {
val MaxTargetVersion = ScalaVersion(javaSpecVersion) match {
case SpecificScalaVersion(1, minor, _, _) => minor
case SpecificScalaVersion(major, _, _, _) => major
- case _ => 20
+ case _ => 21
}
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 85c4cef274f1..750a66fa890b 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/versions.properties b/versions.properties
index 9bd91efa4226..08aa27aa766c 100644
--- a/versions.properties
+++ b/versions.properties
@@ -6,7 +6,7 @@ starr.version=2.13.11-M1
# - scala-compiler: jline (% "optional")
# Other usages:
# - scala-asm: jar content included in scala-compiler
-scala-asm.version=9.4.0-scala-1
+scala-asm.version=9.5.0-scala-1
# jna.version must be updated together with jline-terminal-jna
jline.version=3.22.0