retronym · retronym · Mar 21, 2016 · Mar 23, 2016 · Mar 23, 2016 · Mar 26, 2016
diff --git a/bincompat-forward.whitelist.conf b/bincompat-forward.whitelist.conf
@@ -478,6 +478,10 @@ filter {
     {
         matchName="scala.concurrent.impl.Promise$DefaultPromise"
         problemName=MissingTypesProblem
+    },
+    {
+        matchName="scala.reflect.runtime.Settings.YpartialUnification"
+        problemName=MissingMethodProblem
     }
   ]
 }
diff --git a/build-ant-macros.xml b/build-ant-macros.xml
@@ -6,7 +6,7 @@
     <attribute name="name"/>
     <sequential>
       <antcall target="@{name}">
-        <param name="scalac.args.optimise" value="-Yopt:l:classpath"/>
+        <param name="scalac.args.optimise" value="-opt:l:classpath"/>
       </antcall>
     </sequential>
   </macrodef>

diff --git a/build.sbt b/build.sbt
diff --git a/build.xml b/build.xml
@@ -19,7 +19,7 @@ ant $antArgs $scalacArgs $targets
 
 antArgs tend to be:
  -Darchives.skipxz=true
- -Dscalac.args.optimise=-Yopt:l:classpath
+ -Dscalac.args.optimise=-opt:l:classpath
 
 scalacArgs examples:
   "-Dscalac.args=\"-Yrangepos\" -Dpartest.scalac_opts=\"-Yrangepos\""
@@ -79,13 +79,13 @@ TODO:
   <target name="publish-opt-nodocs" description="Publishes Scala (optimized) without generating docs/testing (library/reflect/compiler/swing).">
     <antcall target="publish">
       <param name="docs.skip" value="1"/>
-      <param name="scalac.args.optimise" value="-Yopt:l:classpath"/>
+      <param name="scalac.args.optimise" value="-opt:l:classpath"/>
     </antcall>
   </target>
   <target name="publish-core-opt-nodocs" description="Builds an untested, undocumented optimised core (library/reflect/compiler) and publishes to maven.">
     <antcall target="publish-core">
       <param name="docs.skip" value="1"/>
-      <param name="scalac.args.optimise" value="-Yopt:l:classpath"/>
+      <param name="scalac.args.optimise" value="-opt:l:classpath"/>
     </antcall>
   </target>
   <target name="publish-core-local-nodocs" description="Builds an untested, undocumented core (library/reflect/compiler) and locally publishes to maven">
@@ -273,10 +273,15 @@ TODO:
         <dependency groupId="org.pantsbuild" artifactId="jarjar" version="1.6.0"/>
       </artifact:dependencies>
 
+      <artifact:dependencies pathId="jarlister.classpath">
+        <dependency groupId="com.github.rjolly" artifactId="jarlister_2.11" version="1.0"/>
+      </artifact:dependencies>
+
       <!-- JUnit -->
       <property name="junit.version" value="4.12"/>
       <artifact:dependencies pathId="junit.classpath" filesetId="junit.fileset">
         <dependency groupId="junit" artifactId="junit" version="${junit.version}"/>
+        <dependency groupId="org.openjdk.jol" artifactId="jol-core" version="0.5"/>
       </artifact:dependencies>
       <copy-deps project="junit"/>
 
@@ -314,7 +319,6 @@ TODO:
       <prepareCross name="scala-parser-combinators" />
       <prepareCross name="scala-swing"/>
       <prepareCross name="partest"/>
-      <prepareCross name="scalacheck"/>
 
       <artifact:dependencies pathId="asm.classpath" filesetId="asm.fileset">
         <dependency groupId="org.scala-lang.modules" artifactId="scala-asm" version="${scala-asm.version}"/>
@@ -334,11 +338,6 @@ TODO:
       </artifact:dependencies>
       <copy-deps project="partest"/>
 
-      <artifact:dependencies pathId="scalacheck.classpath" filesetId="scalacheck.fileset" versionsId="scalacheck.versions">
-        <artifact:remoteRepository refid="extra-repo"/>
-        <dependency groupId="org.scalacheck"         artifactId="scalacheck${scalacheck.cross}"    version="${scalacheck.version.number}" />
-      </artifact:dependencies>
-
       <artifact:dependencies pathId="repl.deps.classpath" filesetId="repl.fileset" versionsId="repl.deps.versions">
         <dependency groupId="jline" artifactId="jline" version="${jline.version}"/>
       </artifact:dependencies>
@@ -368,7 +367,7 @@ TODO:
 
       <propertyForCrossedArtifact name="scala-parser-combinators" jar="org.scala-lang.modules:scala-parser-combinators"/>
       <propertyForCrossedArtifact name="scala-xml"                jar="org.scala-lang.modules:scala-xml"/>
-      <propertyForCrossedArtifact name="scala-swing"                 jar="org.scala-lang.modules:scala-swing"/>
+      <propertyForCrossedArtifact name="scala-swing"              jar="org.scala-lang.modules:scala-swing"/>
 
       <!-- BND support -->
       <typedef resource="aQute/bnd/ant/taskdef.properties" classpathref="extra.tasks.classpath" />
@@ -562,7 +561,6 @@ TODO:
       <echo message="scala-swing.version.number                 = ${scala-swing.version.number}"/>
       <echo message="jline.version                              = ${jline.version}"/>
       <echo message="partest.version.number                     = ${partest.version.number}"/>
-      <echo message="scalacheck.version.number                  = ${scalacheck.version.number}"/>
 
       <propertyfile file="versions.properties">
         <entry key="starr.version"                              value="${starr.version}"/>
@@ -572,7 +570,6 @@ TODO:
         <entry key="scala-swing.version.number"                 value="${scala-swing.version.number}"/>
         <entry key="jline.version"                              value="${jline.version}"/>
         <entry key="partest.version.number"                     value="${partest.version.number}"/>
-        <entry key="scalacheck.version.number"                  value="${scalacheck.version.number}"/>
       </propertyfile>
     </then></if>
 
@@ -786,10 +783,14 @@ TODO:
       <path refid="aux.libs"/>
     </path>
 
+    <path id="pack.lib.path">
+      <pathelement location="${library.jar}"/>
+      <path refid="jarlister.classpath"/>
+    </path>
+
     <path id="pack.bin.tool.path">
       <pathelement location="${library.jar}"/>
       <pathelement location="${xml.jar}"/>
-      <pathelement location="${parser-combinators.jar}"/>
       <pathelement location="${reflect.jar}"/>
       <pathelement location="${compiler.jar}"/>
       <!-- TODO modularize compiler: <pathelement location="${scaladoc.jar}"/> -->
@@ -802,7 +803,9 @@ TODO:
       <fileset dir="${build-quick.dir}/classes/library"/>
     </path>
 
-    <path id="pack.repl-jline.files">    <fileset dir="${build-quick.dir}/classes/repl-jline"/> </path>
+    <path id="pack.repl-jline.files">
+      <fileset dir="${build-quick.dir}/classes/repl-jline"/>
+    </path>
 
     <path id="pack.compiler.files">
       <fileset dir="${build-quick.dir}/classes/compiler"/>
@@ -911,29 +914,16 @@ TODO:
       <!-- partest's dependencies, which marks most of its dependencies as provided,
            (but not scala-library, so we filter that one out...)
            so we provide them: scala-[library/reflect/compiler], scalap built here,
-           scala-xml, scala-parser-combinators via external-modules-nocore,
-           scalacheck as part of `partest.classpath` -->
+           scala-xml via external-modules-nocore, as part of `partest.classpath` -->
       <restrict>
         <path refid="partest.classpath"/>
         <rsel:not><rsel:or>
           <rsel:name name="scala-library*.jar"/>
         </rsel:or></rsel:not>
       </restrict>
       <pathelement location="${scala-xml}"/>
-      <pathelement location="${scala-parser-combinators}"/>
       <!-- <pathelement location="${scala-swing}"/> -->
 
-      <restrict>
-        <path refid="scalacheck.classpath"/>
-        <rsel:not><rsel:or>
-          <rsel:name name="scala-library*.jar"/>
-          <rsel:name name="scala-compiler*.jar"/>
-          <rsel:name name="scala-reflect*.jar"/>
-          <rsel:name name="scala-parser-combinators*.jar"/>
-          <rsel:name name="scala-xml*.jar"/>
-        </rsel:or></rsel:not>
-      </restrict>
-
       <!-- partest classes specific to the core compiler build -->
       <pathelement location="${partest-extras.jar}"/>
       <pathelement location="${partest-javaagent.jar}"/>
@@ -1042,7 +1032,7 @@ TODO:
     <antcall target="publish-core-local">
       <param name="maven.version.suffix" value="-STARR-${git.commit.sha}-SNAPSHOT"/>
       <param name="docs.skip" value="1"/>
-      <param name="scalac.args.optimise" value="-Yopt:l:classpath"/>
+      <param name="scalac.args.optimise" value="-opt:l:classpath"/>
       <param name="update.starr.version" value="alright then"/>
     </antcall>
   </target>
@@ -1137,7 +1127,10 @@ TODO:
 <!-- ===========================================================================
                                   PACKED QUICK BUILD (PACK)
 ============================================================================ -->
-  <target name="pack.lib"    depends="quick.lib"> <staged-pack project="library"/></target>
+  <target name="pack.lib" depends="quick.lib"> <staged-pack project="library"/>
+    <taskdef resource="scala/tools/ant/antlib.xml" classpathref="pack.lib.path"/>
+    <jarlister file="${library.jar}"/>
+  </target>
 
   <target name="pack.reflect" depends="quick.reflect"> <staged-pack project="reflect"/> </target>
 
@@ -1163,7 +1156,7 @@ TODO:
       </pre>
       <!-- JSR-223 support introduced in 2.11 -->
       <jar-opts>
-        <service type="javax.script.ScriptEngineFactory" provider="scala.tools.nsc.interpreter.IMain$Factory"/>
+        <service type="javax.script.ScriptEngineFactory" provider="scala.tools.nsc.interpreter.Scripted$Factory"/>
       </jar-opts>
     </staged-pack>
   </target>
@@ -1284,8 +1277,6 @@ TODO:
             <include name="${interactive.jar}"/>
             <include name="${scaladoc.jar}"/>
             -->
-
-          <file name="${parser-combinators.jar}"/>
           <file name="${xml.jar}"/>
           <file name="${swing.jar}"/>
         </filelist>

diff --git a/dbuild-meta.json b/dbuild-meta.json
@@ -48,11 +48,6 @@
                     "extension" : "jar",
                     "name" : "scala-xml",
                     "organization" : "org.scala-lang.modules"
-                },
-                {
-                    "extension" : "jar",
-                    "name" : "scala-parser-combinators",
-                    "organization" : "org.scala-lang.modules"
                 }
             ],
             "name" : "scala-compiler",

diff --git a/doc/LICENSE.md b/doc/LICENSE.md
@@ -46,6 +46,7 @@ This license is used by the following third-party libraries:
 This license is used by the following third-party libraries:
 
   * jline
+  * scalacheck
 
 ### [BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause)
 This license is used by the following third-party libraries:

diff --git a/doc/licenses/bsd_scalacheck.txt b/doc/licenses/bsd_scalacheck.txt
@@ -0,0 +1,32 @@
+ScalaCheck LICENSE
+
+Copyright (c) 2007-2013, Rickard Nilsson
+All rights reserved.
+
+Permission to use, copy, modify, and distribute this software in source
+or binary form for any purpose with or without fee is hereby granted,
+provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+   3. Neither the name of the author nor the names of its contributors
+      may be used to endorse or promote products derived from this
+      software without specific prior written permission.
+
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
@@ -0,0 +1,11 @@
+import sbt._
+
+/** This object defines keys that should be visible with an unqualified name in all .sbt files and the command line */
+object BuildSettings extends AutoPlugin {
+  object autoImport {
+    lazy val antStyle = settingKey[Boolean]("Use ant-style incremental builds instead of name-hashing")
+    lazy val baseVersion = settingKey[String]("The base version number from which all others are derived")
+    lazy val baseVersionSuffix = settingKey[String]("Identifies the kind of version to build")
+    lazy val mimaReferenceVersion = settingKey[Option[String]]("Scala version number to run MiMa against")
+  }
+}
diff --git a/project/MiMa.scala b/project/MiMa.scala
@@ -0,0 +1,95 @@
+// It would be nice to use sbt-mima-plugin here, but the plugin is missing
+// at least two features we need:
+// * ability to run MiMa twice, swapping `curr` and `prev`, to detect
+//   both forwards and backwards incompatibilities (possibly fixed as of
+//   https://github.com/typesafehub/migration-manager/commit/2844ffa48b6d2255aa64bd687703aec21dadd55e)
+// * ability to pass a filter file (https://github.com/typesafehub/migration-manager/issues/102)
+// So we invoke the MiMa CLI directly; it's also what the Ant build did.
+
+import sbt._
+import sbt.Keys._
+import BuildSettings.autoImport._
+
+object MiMa {
+  lazy val mima =
+    taskKey[Unit]("run Migration Manager to detect binary incompatibilities")
+
+  lazy val settings =
+    Seq(
+      mima := {
+        val log = streams.value.log
+        mimaReferenceVersion.value.fold {
+          log.info(s"No reference version defined - skipping binary compatibility checks")
+        } { refVersion =>
+          def runOnce(prev: java.io.File, curr: java.io.File, isForward: Boolean): Unit = {
+            val direction = if (isForward) "forward" else "backward"
+            log.info(s"Checking $direction binary compatibility")
+            log.debug(s"prev = $prev, curr = $curr")
+            runMima(
+              prev = if (isForward) curr else prev,
+              curr = if (isForward) prev else curr,
+              // TODO: it would be nicer if each subproject had its own whitelist, but for now
+              // for compatibility with how Ant did things, there's just one at the root.
+              // once Ant is gone we'd be free to split it up.
+              filter = (baseDirectory in ThisBuild).value / s"bincompat-$direction.whitelist.conf",
+              log)
+          }
+          val artifact =
+            getPreviousArtifact(
+              "org.scala-lang" % s"${name.value}" % refVersion,
+              ivySbt.value, streams.value)
+          for (isForward <- Seq(false, true))
+            runOnce(artifact, (packageBin in Compile).value, isForward)
+        }
+      }
+    )
+
+  def runMima(prev: java.io.File, curr: java.io.File, filter: java.io.File, log: Logger): Unit = {
+    val args = Array(
+      "--prev", prev.getAbsolutePath,
+      "--curr", curr.getAbsolutePath,
+      "--filters", filter.getAbsolutePath,
+      "--generate-filters"
+    )
+    val exitCode = TrapExit(com.typesafe.tools.mima.cli.Main.main(args), log)
+    if (exitCode != 0)
+      throw new RuntimeException(s"MiMa failed with exit code $exitCode")
+  }
+
+  // cribbed from https://github.com/typesafehub/migration-manager/blob/master/sbtplugin/src/main/scala/com/typesafe/tools/mima/plugin/SbtMima.scala
+  def getPreviousArtifact(m: ModuleID, ivy: IvySbt, s: TaskStreams): File = {
+    val moduleSettings = InlineConfiguration(
+      "dummy" % "test" % "version",
+      ModuleInfo("dummy-test-project-for-resolving"),
+      dependencies = Seq(m))
+    val module = new ivy.Module(moduleSettings)
+    val report = Deprecated.Inner.ivyUpdate(ivy)(module, s)
+    val optFile = (for {
+      config <- report.configurations
+      module <- config.modules
+      (artifact, file) <- module.artifacts
+      // TODO - Hardcode this?
+      if artifact.name == m.name
+    } yield file).headOption
+    optFile getOrElse sys.error("Could not resolve previous artifact: " + m)
+  }
+
+}
+
+// use the SI-7934 workaround to silence a deprecation warning on an sbt API
+// we have no choice but to call.  on the lack of any suitable alternative,
+// see https://gitter.im/sbt/sbt-dev?at=5616e2681b0e279854bd74a4 :
+// "it's my intention to eventually come up with a public API" says Eugene Y
+object Deprecated {
+  @deprecated("", "") class Inner {
+    def ivyUpdate(ivy: IvySbt)(module: ivy.Module, s: TaskStreams) =
+      IvyActions.update(
+        module,
+        new UpdateConfiguration(
+          retrieve = None,
+          missingOk = false,
+          logging = UpdateLogging.DownloadOnly),
+        s.log)
+  }
+  object Inner extends Inner
+}