Move scalafix to main build

Author: MasseGuillaume

CONTRIBUTING.md

@@ -19,14 +19,14 @@ set -e
 RELEASE_COMBO=true
 
 if [[ "$TEST_SCALAFIX" == "true" ]]; then
-  cd scalafix && sbt tests/test
+  sbt scalafixTests/test
   exit 0
 fi
 
 if [ "$SCALAJS_VERSION" = "" ]; then
-  projectPrefix="scala-collection-compat"
+  projectPrefix="compat"
 else
-  projectPrefix="scala-collection-compatJS"
+  projectPrefix="compatJS"
 fi
 
 verPat="[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9-]+)?"

admin/build.sh

@@ -1,16 +1,86 @@
-import sbtcrossproject.{crossProject, CrossType}
 import ScalaModulePlugin._
+import sbtcrossproject.{crossProject, CrossType}
+import _root_.scalafix.Versions.{version => scalafixVersion, scala212 => scalafixScala212}
+
+lazy val scala212 = "2.12.6"
+lazy val scala213 = "2.13.0-M4"
+
+lazy val scala213Settings = Seq(
+  resolvers += "scala-pr" at "https://scala-ci.typesafe.com/artifactory/scala-integration/",
+  scalaVersion := scala213
+)
 
 inThisBuild(Seq(
-  crossScalaVersions := Seq("2.12.6", "2.13.0-M4", "2.11.12")
+  crossScalaVersions := Seq(scala212, scala213, "2.11.12")
 ))
 
-disablePlugins(JvmPlugin)
 
-lazy val `scala-collection-compat` = crossProject(JSPlatform, JVMPlatform)
+lazy val root = project
+  .in(file("."))
+  .aggregate(
+    compatJVM, compatJS,
+    scalafixRules, scalafixInput, scalafixTests,
+    scalafixOutput212, scalafixOutput213
+  )
+  .disablePlugins(ScalafixPlugin)
+
+lazy val scalafixInput = project
+  .in(file("scalafix-input"))
+  .settings(
+    scalaVersion := scalafixScala212,
+    scalafixSourceroot := sourceDirectory.in(Compile).value
+  )
+
+lazy val scalafixOutput212 = project
+  .in(file("scalafix-output212"))
+  .settings(scalaVersion := scalafixScala212)
+  .dependsOn(compatJVM)
+
+lazy val scalafixOutput213 = project
+  .in(file("scalafix-output213"))
+  .settings(scala213Settings)
+
+lazy val scalafixOutput213Failure = project
+  .in(file("scalafix-output213-failure"))
+  .settings(scala213Settings)
+
+lazy val scalafixRules = project
+  .in(file("scalafix-rules"))
+  .settings(
+    scalaVersion := scalafixScala212,
+    libraryDependencies += "ch.epfl.scala" %% "scalafix-core" % scalafixVersion
+  )
+
+lazy val scalafixTests = project
+  .in(file("scalafix-tests"))
+  .settings(
+    scalaVersion := scalafixScala212,
+    libraryDependencies += "ch.epfl.scala" % "scalafix-testkit" % scalafixVersion % Test cross CrossVersion.full,
+    buildInfoPackage := "fix",
+    buildInfoKeys := Seq[BuildInfoKey](
+      "inputSourceroot" ->
+        sourceDirectory.in(scalafixInput, Compile).value,
+      "output212Sourceroot" ->
+        sourceDirectory.in(scalafixOutput212, Compile).value,
+      "output213Sourceroot" ->
+        sourceDirectory.in(scalafixOutput213, Compile).value,
+      "output213FailureSourceroot" ->
+        sourceDirectory.in(scalafixOutput213Failure, Compile).value,
+      "inputClassdirectory" ->
+        classDirectory.in(scalafixInput, Compile).value
+    ),
+    test in Test := (test in Test).dependsOn(
+      compile in (scalafixOutput212, Compile),
+      compile in (scalafixOutput213, Compile)
+    ).value
+  )
+  .dependsOn(scalafixInput, scalafixRules)
+  .enablePlugins(BuildInfoPlugin)
+
+lazy val compat = crossProject(JSPlatform, JVMPlatform)
   .withoutSuffixFor(JVMPlatform)
   .crossType(CrossType.Pure)
-  .in(file("."))
+  .in(file("compat"))
   .settings(scalaModuleSettings)
   .jvmSettings(scalaModuleSettingsJVM)
   .settings(
@@ -36,6 +106,7 @@ lazy val `scala-collection-compat` = crossProject(JSPlatform, JVMPlatform)
     fork in Test := false // Scala.js cannot run forked tests
   )
   .jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin))
+  .disablePlugins(ScalafixPlugin)
 
-lazy val `scala-collection-compatJVM` = `scala-collection-compat`.jvm
-lazy val `scala-collection-compatJS` = `scala-collection-compat`.js
+lazy val compatJVM = compat.jvm
+lazy val compatJS  = compat.js

build.sbt

@@ -5,9 +5,10 @@ else
   // see https://github.com/scala/sbt-scala-module/issues/35
   Seq(addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.3"))
 
-val scalaJSVersion =
-  Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.23")
+val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.23")
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)
-addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.4.0")
-addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.14")
+addSbtPlugin("org.scala-js"           % "sbt-scalajs"              % scalaJSVersion)
+addSbtPlugin("org.portable-scala"     % "sbt-scalajs-crossproject" % "0.4.0")
+addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module"         % "1.0.14")
+addSbtPlugin("ch.epfl.scala"          % "sbt-scalafix"             % "0.5.10")
+addSbtPlugin("com.eed3si9n"           % "sbt-buildinfo"            % "0.7.0")