diff options
| author | Lukas Rytz <lukas.rytz@epfl.ch> | 2012-07-20 11:56:04 -0700 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2012-07-20 11:56:04 -0700 |
| commit | b0742ebacb5fb5982baa1096ad12457d9b14124e (patch) | |
| tree | bd6be721db18bdc30a86b7b7ebd5f5755e44809c /src/compiler/scala/tools/ant | |
| parent | b67828d03908a3b94ca42404355b28f0f999eb89 (diff) | |
| parent | 444bba68cc59e032c7f57087979d0b757ab3e94f (diff) | |
| download | scala-b0742ebacb5fb5982baa1096ad12457d9b14124e.tar.gz scala-b0742ebacb5fb5982baa1096ad12457d9b14124e.tar.bz2 scala-b0742ebacb5fb5982baa1096ad12457d9b14124e.zip | |
Merge pull request #948 from gkossakowski/target-1.6
Deprecate all JVM 1.5 targets and make 1.6 default.
Diffstat (limited to 'src/compiler/scala/tools/ant')
| -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 e70716885e..c6809fb48e 100644 --- a/src/compiler/scala/tools/ant/Scalac.scala +++ b/src/compiler/scala/tools/ant/Scalac.scala @@ -99,7 +99,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", "msil") + val values = List("jvm-1.5", "jvm-1.5-fjbg", "jvm-1.5-asm", "jvm-1.6", "jvm-1.7", "msil") } /** Defines valid values for the `deprecation` and `unchecked` properties. */ |