summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/settings/AbsScalaSettings.scala
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2015-01-29 14:40:45 +1000
committerAdriaan Moors <adriaan.moors@typesafe.com>2015-05-26 18:04:55 -0700
commit8d2d3c702d2010d40ed6facb771add48999216c1 (patch)
tree7eb0868cbdde147d6ad0df41ab8a3666ab11819a /src/compiler/scala/tools/nsc/settings/AbsScalaSettings.scala
parent7b224c57c2712994c043c749028cb2589155358f (diff)
downloadscala-8d2d3c702d2010d40ed6facb771add48999216c1.tar.gz
scala-8d2d3c702d2010d40ed6facb771add48999216c1.tar.bz2
scala-8d2d3c702d2010d40ed6facb771add48999216c1.zip
Require and target Java 8
- Require Java 8 in ant build - use -source 1.8 and -target 1.8 for javac - Default scalac's -target to `jvm-1.8`, ignore and deprecate attempts to use `jvm-1.{6.7}` - Remove fragile javap-app test. The feature itself is slated for removal. - Remove obsolete Java6 checkfile - Adapt DCE tests - Remove deprecated/redundant -target:jvm-1.6 from flags where the intent was to trigger generation of stack map frames. - Remove tests with -target:jvm-1.5 that tested without stack map frames - Ignore OpenJDK JVM warnings (via test/[files|scaladoc]/filters).
Diffstat (limited to 'src/compiler/scala/tools/nsc/settings/AbsScalaSettings.scala')
-rw-r--r--src/compiler/scala/tools/nsc/settings/AbsScalaSettings.scala1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/AbsScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/AbsScalaSettings.scala
index 6b339b2a6d..8386722b63 100644
--- a/src/compiler/scala/tools/nsc/settings/AbsScalaSettings.scala
+++ b/src/compiler/scala/tools/nsc/settings/AbsScalaSettings.scala
@@ -31,6 +31,7 @@ trait AbsScalaSettings {
def BooleanSetting(name: String, descr: String): BooleanSetting
def ChoiceSetting(name: String, helpArg: String, descr: String, choices: List[String], default: String): ChoiceSetting
+ def ChoiceSettingForcedDefault(name: String, helpArg: String, descr: String, choices: List[String], default: String): ChoiceSetting
def IntSetting(name: String, descr: String, default: Int, range: Option[(Int, Int)], parser: String => Option[Int]): IntSetting
def MultiStringSetting(name: String, helpArg: String, descr: String): MultiStringSetting
def MultiChoiceSetting[E <: MultiChoiceEnumeration](name: String, helpArg: String, descr: String, domain: E, default: Option[List[String]]): MultiChoiceSetting[E]