diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2014-11-10 12:48:18 +0100 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2014-11-10 12:48:18 +0100 |
| commit | af8ccf7e23a459c202ed7fc227e9767132c8b89f (patch) | |
| tree | 0fb33c43b9760c03053a7c851a95f8048aeb779f /src/compiler | |
| parent | 60d59ee9f3ac37b59c93488f5e71fe38c5fff4b7 (diff) | |
| parent | 310af49e09fceac96ea715b88039a8c7a3ec8bb8 (diff) | |
| download | scala-af8ccf7e23a459c202ed7fc227e9767132c8b89f.tar.gz scala-af8ccf7e23a459c202ed7fc227e9767132c8b89f.tar.bz2 scala-af8ccf7e23a459c202ed7fc227e9767132c8b89f.zip | |
Merge pull request #4104 from retronym/ticket/8966
SI-8966 Allow use of jvm-1.8 via the Ant scalac task
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/ant/Scalac.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/ant/Scalac.scala b/src/compiler/scala/tools/ant/Scalac.scala index 1747405f03..8905c94eeb 100644 --- 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. */ |