Merge pull request scala#4104 from retronym/ticket/8966

lrytz · lrytz · commit af8ccf7e23a4 · 2014-11-10T12:48:18.000+01:00
SI-8966 Allow use of jvm-1.8 via the Ant scalac task
diff --git a/src/compiler/scala/tools/ant/Scalac.scala b/src/compiler/scala/tools/ant/Scalac.scala
@@ -97,7 +97,7 @@ class Scalac extends ScalaMatchingTask with ScalacShared {
 
   /** Defines valid values for the `target` property. */
   object Target extends PermissibleValue {
-    val values = List("jvm-1.5", "jvm-1.6", "jvm-1.7")
+    val values = List("jvm-1.5", "jvm-1.6", "jvm-1.7", "jvm-1.8")
   }
 
   /** Defines valid values for the `deprecation` and `unchecked` properties. */

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ class Scalac extends ScalaMatchingTask with ScalacShared {`
`97`	`97`
`98`	`98`	/** Defines valid values for the `target` property. */
`99`	`99`	`object Target extends PermissibleValue {`
`100`		`- val values = List("jvm-1.5", "jvm-1.6", "jvm-1.7")`
	`100`	`+ val values = List("jvm-1.5", "jvm-1.6", "jvm-1.7", "jvm-1.8")`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	/** Defines valid values for the `deprecation` and `unchecked` properties. */