diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-06-28 18:01:14 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2016-06-28 23:09:38 -0700 |
| commit | d8c862b225cc7936e475419abaabb07226fea568 (patch) | |
| tree | 36ef9af07fc6b2296e678459525bee3f4f55e861 | |
| parent | 9901daf6dcd78fb0a5b359d1c9549114ce23aa0c (diff) | |
| download | scala-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)
| -rw-r--r-- | project/ScriptCommands.scala | 2 | ||||
| -rw-r--r-- | test/benchmarks/build.sbt | 2 | ||||
| -rw-r--r-- | versions.properties | 6 |
3 files changed, 5 insertions, 5 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) diff --git a/test/benchmarks/build.sbt b/test/benchmarks/build.sbt index 31cee701ad..fb05fb2c99 100644 --- a/test/benchmarks/build.sbt +++ b/test/benchmarks/build.sbt @@ -1,6 +1,6 @@ scalaHome := Some(file("../../build/pack")) scalaVersion := "2.12.0-dev" -scalacOptions ++= Seq("-feature", "-Yopt:l:classpath") +scalacOptions ++= Seq("-feature", "-opt:l:classpath") lazy val root = (project in file(".")). enablePlugins(JmhPlugin). diff --git a/versions.properties b/versions.properties index 3b8077ab88..bf7c7d2faa 100644 --- a/versions.properties +++ b/versions.properties @@ -8,7 +8,7 @@ # The scala version used for bootstrapping. This has no impact on the final classfiles: # there are two stages (locker and quick), so compiler and library are always built # with themselves. Stability is ensured by building a third stage (strap). -starr.version=2.12.0-M4 +starr.version=2.12.0-M4-9901daf # These are the versions of the modules that go with this release. # These properties are used during PR validation and in dbuild builds. @@ -19,7 +19,7 @@ starr.version=2.12.0-M4 # - After 2.x.0 is released, the binary version is 2.x. # - During milestones and RCs, modules are cross-built against the full version. # So the value is the full version (e.g. 2.12.0-M2). -scala.binary.version=2.12.0-M4 +scala.binary.version=2.12.0-M4-9901daf # external modules shipped with distribution, as specified by scala-library-all's pom scala-xml.version.number=1.0.5 @@ -30,7 +30,7 @@ jline.version=2.14.1 scala-asm.version=5.0.4-scala-3 # external modules, used internally (not shipped) -partest.version.number=1.0.16 +partest.version.number=1.0.17 # We've embedded these sources in partest-extras for now. After 2.12.0 is released # we can switch to a public release. # scalacheck.version.number=1.11.6 |