Cross-build to 2.12 (scalacenter#28)

* Upgrade scalameta and cross-build to 2.12

* Gracefully handle 2.11 and 2.12 in sbt plugin.

* Don't rely on sbt.ivy.home.

.drone.yml

@@ -3,7 +3,24 @@ build:
   environment:
     - COURSIER_CACHE=/drone/cache/coursier
   commands:
-    - ./bin/testAll.sh
+    - export SBT_OPTS="-Xmx24G -XX:MaxPermSize=4G -Xss4M"
+    # configuring ivy.home doesn't seem to work. Maybe related:
+    #   https://github.com/sbt/sbt/issues/1894
+    # After 10+ experiments I've given up on trying to use sbt.ivy.yhome and
+    # copy the files myself instead, as recommended here:
+    #   http://readme.drone.io/usage/caching/
+    - test -d /drone/.sbt && cp -a /drone/.sbt /root
+    - rm -rf /drone/.sbt
+
+    - test -d /drone/.ivy2 && cp -a /drone/.ivy2 /root
+    - rm -rf /drone/.ivy2
+
+    - sbt clean test scripted
+
+    - cp -a /root/.ivy2 /drone
+    - cp -a /root/.sbt /drone
 cache:
   mount:
+    - /drone/.sbt
+    - /drone/.ivy2
     - /drone/cache

build.sbt

@@ -3,6 +3,8 @@ import sbt.ScriptedPlugin._
 organization in ThisBuild := "ch.epfl.scala"
 version in ThisBuild := scalafix.Versions.nightly
 
+lazy val crossVersions = Seq("2.11.8", "2.12.1")
+
 lazy val buildSettings = Seq(
   assemblyJarName in assembly := "scalafix.jar",
   // See core/src/main/scala/ch/epfl/scala/Versions.scala
@@ -88,20 +90,21 @@ lazy val root = project
     `scalafix-nsc`,
     `scalafix-tests`,
     core,
-    cli,
+//    cli, // superseded by sbt plugin
     readme,
     `scalafix-sbt`
   )
   .dependsOn(core)
 
 lazy val core = project
-  .settings(allSettings)
   .settings(
+    allSettings,
+    crossScalaVersions := crossVersions,
     moduleName := "scalafix-core",
     addCompilerPlugin(
       "org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full),
     libraryDependencies ++= Seq(
-      "com.lihaoyi"    %% "sourcecode"   % "0.1.2",
+      "com.lihaoyi"    %% "sourcecode"   % "0.1.3",
       "org.scalameta"  %% "scalameta"    % Build.metaV,
       "org.scala-lang" % "scala-reflect" % scalaVersion.value,
       // Test dependencies
@@ -114,6 +117,7 @@ lazy val `scalafix-nsc` = project
   .settings(
     allSettings,
     scalaVersion := "2.11.8",
+    crossScalaVersions := crossVersions,
     libraryDependencies ++= Seq(
       "org.scala-lang" % "scala-compiler" % scalaVersion.value,
       "org.scalameta"  %% "scalameta"     % Build.metaV % "provided",
@@ -185,7 +189,7 @@ lazy val `scalafix-sbt` = project.settings(
   moduleName := "sbt-scalafix",
   sources in Compile +=
     baseDirectory.value / "../core/src/main/scala/scalafix/Versions.scala",
-  scriptedLaunchOpts := Seq(
+  scriptedLaunchOpts ++= Seq(
     "-Dplugin.version=" + version.value,
     // .jvmopts is ignored, simulate here
     "-XX:MaxPermSize=256m",

core/src/main/scala/scalafix/Versions.scala

@@ -1,7 +1,7 @@
 package scalafix
 
 object Versions {
-  val nightly = "0.2.0-RC1"
+  val nightly = "0.2.0-RC2-SNAPSHOT"
   val stable: String = nightly
   val scala = "2.11.8"
 }

project/Build.scala

@@ -1,4 +1,4 @@
 object Build {
-  val metaV = "1.3.0"
+  val metaV = "1.4.0"
   val testV = "3.0.0"
 }

project/plugins.sbt

@@ -1,10 +1,10 @@
-addSbtPlugin("com.eed3si9n"     % "sbt-assembly"        % "0.14.3")
-addSbtPlugin("com.lihaoyi"      % "scalatex-sbt-plugin" % "0.3.5")
-addSbtPlugin("io.get-coursier"  % "sbt-coursier"        % "1.0.0-M15")
-addSbtPlugin("org.brianmckenna" % "sbt-wartremover"     % "0.14")
-addSbtPlugin("org.xerial.sbt"   % "sbt-pack"            % "0.8.0")
-addSbtPlugin("com.jsuereth"     % "sbt-pgp"             % "1.0.0")
-addSbtPlugin("org.xerial.sbt"   % "sbt-sonatype"        % "1.1")
+addSbtPlugin("com.eed3si9n"    % "sbt-assembly"        % "0.14.3")
+addSbtPlugin("com.lihaoyi"     % "scalatex-sbt-plugin" % "0.3.5")
+addSbtPlugin("io.get-coursier" % "sbt-coursier"        % "1.0.0-M15")
+addSbtPlugin("org.wartremover" % "sbt-wartremover"     % "1.2.1")
+addSbtPlugin("org.xerial.sbt"  % "sbt-pack"            % "0.8.0")
+addSbtPlugin("com.jsuereth"    % "sbt-pgp"             % "1.0.0")
+addSbtPlugin("org.xerial.sbt"  % "sbt-sonatype"        % "1.1")
 
 // TODO(olafur) re-enable scoverage.
 // scoverage is disabled because it messes up with scalafix-nsc

scalafix-sbt/src/main/scala/scalafix/sbt/ScalafixPlugin.scala

@@ -9,8 +9,8 @@ trait ScalafixKeys {
     settingKey[Seq[String]]("Which scalafix rules should run?")
   val scalafixEnabled: SettingKey[Boolean] =
     settingKey[Boolean]("Is scalafix enabled?")
-  val scalafixInternalJar: TaskKey[File] =
-    taskKey[File]("Path to scalafix-nsc compiler plugin jar.")
+  val scalafixInternalJar: TaskKey[Option[File]] =
+    taskKey[Option[File]]("Path to scalafix-nsc compiler plugin jar.")
 }
 
 object rewrite {
@@ -22,49 +22,59 @@ object rewrite {
 
 object ScalafixPlugin extends AutoPlugin with ScalafixKeys {
   object autoImport extends ScalafixKeys
+  private val Version = "2\\.(\\d\\d)\\.".r
   private val nightlyVersion = _root_.scalafix.Versions.nightly
   private val disabled = sys.props.contains("scalafix.disable")
-  private val scalafixStub =
+  private def jar(report: UpdateReport): Option[File] =
+    report.allFiles.find(
+      _.getAbsolutePath.matches(s".*scalafix-nsc_2.[12].jar$$"))
+  private def stub(version: String) =
     Project(id = "scalafix-stub", base = file("project/scalafix")).settings(
       description :=
         """Serves as a caching layer for extracting the jar location of the
           |scalafix-nsc compiler plugin. If the dependecy was added to all
           |projects, the (slow) update task will be re-run for every project.""".stripMargin,
-      scalaVersion := "2.11.8", // TODO(olafur) 2.12 support
-      libraryDependencies +=
-        "ch.epfl.scala" %% "scalafix-nsc" % nightlyVersion % Compile
+      scalaVersion := version,
+      libraryDependencies ++= Seq(
+        "ch.epfl.scala" %% "scalafix-nsc" % nightlyVersion
+      )
     )
+  private val scalafix211 = stub("2.11.8")
+  private val scalafix212 = stub("2.12.1")
 
-  override def extraProjects: Seq[Project] = Seq(scalafixStub)
+  override def extraProjects: Seq[Project] = Seq(scalafix211, scalafix212)
 
   override def requires = JvmPlugin
   override def trigger: PluginTrigger = AllRequirements
 
   val scalafix: Command = Command.command("scalafix") { state =>
-    s"set scalafixEnabled in Global := true" ::
+    s"set scalafixEnabled := true" ::
       "clean" ::
         "test:compile" ::
-          s"set scalafixEnabled in Global := false" ::
+          s"set scalafixEnabled := false" ::
             state
   }
 
-  override def projectSettings: Seq[Def.Setting[_]] =
+  override def globalSettings: Seq[Def.Setting[_]] =
     Seq(
       commands += scalafix,
       scalafixRewrites := Seq(
         rewrite.ExplicitImplicit,
         rewrite.ProcedureSyntax
       ),
-      scalafixInternalJar in Global := {
-        // TODO(olafur) 2.12 support
-        (update in scalafixStub).value.allFiles
-          .find(_.getAbsolutePath.matches(".*scalafix-nsc[^-]*.jar$"))
-          .getOrElse {
-            throw new IllegalStateException(
-              "Unable to find scalafix-nsc in library dependencies!")
+      scalafixInternalJar :=
+        Def
+          .taskDyn[Option[File]] {
+            scalaVersion.value match {
+              case Version("11") =>
+                Def.task(jar((update in scalafix211).value))
+              case Version("12") =>
+                Def.task(jar((update in scalafix212).value))
+              case _ => Def.task(None)
+            }
           }
-      },
-      scalafixEnabled in Global := false,
+          .value,
+      scalafixEnabled := false,
       scalacOptions ++= {
         // scalafix should not affect compilations outside of the scalafix task.
         // The approach taken here is the same as scoverage uses, see:
@@ -79,11 +89,12 @@ object ScalafixPlugin extends AutoPlugin with ScalafixKeys {
               val prefixed = rewrites.map(x => s"scalafix:$x")
               Some(s"-P:${prefixed.mkString(",")}")
             }
-          val jar = (scalafixInternalJar in Global).value.getAbsolutePath
-          Seq(
-            Some(s"-Xplugin:$jar"),
-            config
-          ).flatten
+          (scalafixInternalJar).value.map { jar =>
+            Seq(
+              Some(s"-Xplugin:${jar.getAbsolutePath}"),
+              config
+            ).flatten
+          }.getOrElse(Nil)
         }
       }
     )

scalafix-sbt/src/sbt-test/sbt-scalafix/basic/build.sbt

@@ -6,7 +6,8 @@ lazy val root = project
   .settings(commonSettings)
   .aggregate(
     p1,
-    p2
+    p2,
+    p3
   )
 
 lazy val p1 = project.settings(
@@ -16,6 +17,10 @@ lazy val p2 = project.settings(
   scalaVersion := "2.10.5"
 )
 
+lazy val p3 = project.settings(
+  scalaVersion := "2.12.1"
+)
+
 TaskKey[Unit]("check") := {
   def assertContentMatches(file: String, expectedUntrimmed: String): Unit = {
     val expected = expectedUntrimmed.trim
@@ -52,7 +57,7 @@ TaskKey[Unit]("check") := {
       |  }
       |}""".stripMargin
   val testExpected = expected.replaceFirst("Main", "TestMain")
-  Seq("", "p1/").foreach { prefix =>
+  Seq("", "p1/", "p3/").foreach { prefix =>
     assertContentMatches(
       prefix + "src/test/scala/Test.scala",
       testExpected

scalafix-sbt/src/sbt-test/sbt-scalafix/basic/p3/src/main/scala/Test.scala

@@ -0,0 +1,7 @@
+object Main {
+  implicit val x = 2
+  lazy val y = 2
+  def main(args: Array[String]) {
+    println("hello")
+  }
+}

scalafix-sbt/src/sbt-test/sbt-scalafix/basic/p3/src/test/scala/Test.scala

@@ -0,0 +1,7 @@
+object TestMain {
+  implicit val x = 2
+  lazy val y = 2
+  def main(args: Array[String]) {
+    println("hello")
+  }
+}

scalafix-tests/src/test/scala/scalafix/tests/IntegrationPropertyTest.scala

@@ -53,6 +53,7 @@ abstract class IntegrationPropertyTest(t: ItTest, skip: Boolean = false)
     extends FunSuite
     with TimeLimits {
 
+  private val isCi = sys.props.contains("CI")
   private val maxTime = Span(20, Minutes) // just in case.
 
   val hardClean = false
@@ -165,5 +166,7 @@ class ScalacheckShapeless
       ItTest(
         name = "scalacheck-shapeless",
         repo = "https://github.com/alexarchambault/scalacheck-shapeless.git",
-        hash = "1027b07ea07fe4ca4b1171d55e995d71201b2e6f"
-      ))
+        hash = "bb25ecee23c42148f66d9b27920a89ba5cc189d2"
+      ),
+      skip = true // coursier can't resolve locally published snapshot on ci, sbt.ivy.home is not read.
+    )