Skip to content

Commit 69b79ba

Browse files
committed
Support -target:jvm1.8, needed to call static methods on Java interfaces
1 parent c3d8750 commit 69b79ba

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,7 @@ abstract class GenASM extends SubComponent with BytecodeWriters with GenJVMASM {
372372
case "jvm-1.5-asm" => asm.Opcodes.V1_5
373373
case "jvm-1.6" => asm.Opcodes.V1_6
374374
case "jvm-1.7" => asm.Opcodes.V1_7
375+
case "jvm-1.8" => asm.Opcodes.V1_8
375376
}
376377

377378
private val majorVersion: Int = (classfileVersion & 0xFF)

src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ trait StandardScalaSettings {
4141
val optimise: BooleanSetting // depends on post hook which mutates other settings
4242
val print = BooleanSetting ("-print", "Print program with Scala-specific features removed.")
4343
val target = ChoiceSetting ("-target", "target", "Target platform for object files. All JVM 1.5 targets are deprecated.",
44-
List("jvm-1.5", "jvm-1.5-fjbg", "jvm-1.5-asm", "jvm-1.6", "jvm-1.7", "msil"),
44+
List("jvm-1.5", "jvm-1.5-fjbg", "jvm-1.5-asm", "jvm-1.6", "jvm-1.7", "jvm-1.8", "msil"),
4545
"jvm-1.6")
4646
val unchecked = BooleanSetting ("-unchecked", "Enable additional warnings where generated code depends on assumptions.")
4747
val uniqid = BooleanSetting ("-uniqid", "Uniquely tag all identifiers in debugging output.")

0 commit comments

Comments
 (0)