Skip to content

Commit

Permalink
Backport "Update asm to patched 9.7" to 3.5.2 (#21499)
Browse files Browse the repository at this point in the history
Backports #20144 to the 3.5.2 branch.

PR submitted by the release tooling.
[skip ci]
  • Loading branch information
WojciechMazur authored Aug 28, 2024
2 parents 123ee63 + 25e13ab commit 41591ae
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions compiler/src/dotty/tools/backend/jvm/BackendUtils.scala
Original file line number Diff line number Diff line change
Expand Up @@ -185,5 +185,6 @@ object BackendUtils {
20 -> asm.Opcodes.V20,
21 -> asm.Opcodes.V21,
22 -> asm.Opcodes.V22,
23 -> asm.Opcodes.V23
)
}
2 changes: 1 addition & 1 deletion project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ object Build {

// get libraries onboard
libraryDependencies ++= Seq(
"org.scala-lang.modules" % "scala-asm" % "9.6.0-scala-1", // used by the backend
"org.scala-lang.modules" % "scala-asm" % "9.7.0-scala-2", // used by the backend
Dependencies.compilerInterface,
"org.jline" % "jline-reader" % "3.25.1", // used by the REPL
"org.jline" % "jline-terminal" % "3.25.1",
Expand Down
2 changes: 1 addition & 1 deletion tests/pos-with-compiler-cc/dotc/config/ScalaSettings.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class ScalaSettings extends SettingGroup with AllScalaSettings
object ScalaSettings:
// Keep synchronized with `classfileVersion` in `BCodeIdiomatic`
private val minTargetVersion = 8
private val maxTargetVersion = 22
private val maxTargetVersion = 23

def supportedTargetVersions: List[String] =
(minTargetVersion to maxTargetVersion).toList.map(_.toString)
Expand Down

0 comments on commit 41591ae

Please sign in to comment.