summaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2016-06-28 18:01:14 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2016-06-28 23:09:38 -0700
commitd8c862b225cc7936e475419abaabb07226fea568 (patch)
tree36ef9af07fc6b2296e678459525bee3f4f55e861 /project
parent9901daf6dcd78fb0a5b359d1c9549114ce23aa0c (diff)
downloadscala-d8c862b225cc7936e475419abaabb07226fea568.tar.gz
scala-d8c862b225cc7936e475419abaabb07226fea568.tar.bz2
scala-d8c862b225cc7936e475419abaabb07226fea568.zip
Use 2.12.0-M4-9901daf as STARR (see #5152)
This commit switches to using 2.12.0-M3-dc9effe as STARR, so that we can switch to the new trait encoding where each concrete trait member gets a a static member, which has the actual implementation (as well as serving as a target for for super calls using invokestatic), and a default member (forwards to the static member). Also bump partest to 1.0.17 -- the release that goes with the in-sourcing of scalacheck. Replace a few more -Yopt with -opt (for our new STARR)
Diffstat (limited to 'project')
-rw-r--r--project/ScriptCommands.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/project/ScriptCommands.scala b/project/ScriptCommands.scala
index e5ff38617e..0bf43b18e8 100644
--- a/project/ScriptCommands.scala
+++ b/project/ScriptCommands.scala
@@ -13,7 +13,7 @@ object ScriptCommands {
// Append build.timestamp to Artifactory URL to get consistent build numbers (see https://github.com/sbt/sbt/issues/2088):
publishTo in Global := Some("scala-pr" at url.replaceAll("/$", "") + ";build.timestamp=" + System.currentTimeMillis),
publishArtifact in (Compile, packageDoc) in ThisBuild := false,
- scalacOptions in Compile in ThisBuild += "-Yopt:l:classpath",
+ scalacOptions in Compile in ThisBuild += "-opt:l:classpath",
logLevel in ThisBuild := Level.Info,
logLevel in update in ThisBuild := Level.Warn
), state)