Split rules that can be used to cross compile

Author: MasseGuillaume

admin/build.sh

@@ -19,7 +19,7 @@ set -e
 RELEASE_COMBO=true
 
 if [[ "$TEST_SCALAFIX" == "true" ]]; then
-  cd scalafix && sbt input/compile output/compile tests/test
+  cd scalafix && sbt tests/test
   exit 0
 fi
 

scalafix/build.sbt

@@ -8,7 +8,7 @@ inScope(Global)(
 lazy val root = project
   .in(file("."))
   .aggregate(
-    rules, input, output, tests
+    rules, input, output212, output213, output213Failure, tests
   )
 
 lazy val rules = project.settings(
@@ -20,13 +20,15 @@ lazy val input = project
     scalafixSourceroot := sourceDirectory.in(Compile).value
   )
 
-lazy val output = project
+lazy val output212 = project
+
+lazy val output213 = project
   .settings(
     resolvers += "scala-pr" at "https://scala-ci.typesafe.com/artifactory/scala-integration/",
     scalaVersion := "2.13.0-M4"
   )
 
-lazy val outputFailure = project.in(file("output-failure"))
+lazy val output213Failure = project.in(file("output213-failure"))
   .settings(
     resolvers += "scala-pr" at "https://scala-ci.typesafe.com/artifactory/scala-integration/",
     scalaVersion := "2.13.0-M4"
@@ -39,14 +41,19 @@ lazy val tests = project
     buildInfoKeys := Seq[BuildInfoKey](
       "inputSourceroot" ->
         sourceDirectory.in(input, Compile).value,
-      "outputSourceroot" ->
-        sourceDirectory.in(output, Compile).value,
-      "outputFailureSourceroot" ->
-        sourceDirectory.in(outputFailure, Compile).value,
+      "output212Sourceroot" ->
+        sourceDirectory.in(output212, Compile).value,
+      "output213Sourceroot" ->
+        sourceDirectory.in(output213, Compile).value,
+      "output213FailureSourceroot" ->
+        sourceDirectory.in(output213Failure, Compile).value,
       "inputClassdirectory" ->
         classDirectory.in(input, Compile).value
     ),
-    test in Test := (test in Test).dependsOn(compile in (output, Compile)).value
+    test in Test := (test in Test).dependsOn(
+      compile in (output212, Compile),
+      compile in (output213, Compile)
+    ).value
   )
   .dependsOn(input, rules)
   .enablePlugins(BuildInfoPlugin)

scalafix/input/src/main/scala/fix/CanBuildFromNegSrc.scala

@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.Stable"
+rule = "scala:fix.NewCollections"
  */
 package fix
 

scalafix/input/src/main/scala/fix/CanBuildFromSrc.scala

@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.Stable"
+rule = "scala:fix.NewCollections"
  */
 package fix
 

scalafix/input/src/main/scala/fix/CopyToBufferSrc.scala

@@ -1,13 +1,11 @@
 /*
-rule = "scala:fix.Stable"
+rule = "scala:fix.CrossCompat"
  */
 package fix
 
 import scala.collection.mutable
 
 class CopyToBufferSrc(xs: List[Int], b: mutable.Buffer[Int]) {
-
   xs.copyToBuffer(b)
   (xs ++ xs).copyToBuffer(b)
-
 }

scalafix/input/src/main/scala/fix/FoldSrc.scala

@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.Stable"
+rule = "scala:fix.CrossCompat"
  */
 package fix
 

scalafix/input/src/main/scala/fix/IterableSrc.scala

@@ -1,8 +1,8 @@
 /*
-rule = "scala:fix.Stable"
+rule = "scala:fix.NewCollections"
  */
 package fix
 
 class IterableSrc(it: Iterable[Int]) {
   it.sameElements(it)
-}
+}

scalafix/input/src/main/scala/fix/LinearSeqSrc.scala

@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.Stable"
+rule = "scala:fix.CrossCompat"
  */
 package fix
 

scalafix/input/src/main/scala/fix/MutSetMapSrc.scala

@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.Stable"
+rule = "scala:fix.CrossCompat"
  */
 package fix
 
@@ -10,4 +10,4 @@ class MutSetMapSrc(map: mutable.Map[Int, Int], set: mutable.Set[Int]) {
   map + (2 -> 3)
   (set + 2).size
   map.updated(1, 3)
-}
+}

scalafix/input/src/main/scala/fix/RetainSrc.scala

@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.Stable"
+rule = "scala:fix.NewCollections"
  */
 package fix
 
@@ -9,4 +9,4 @@ class MethodRenames(xs: Map[Int, Int], ys: Set[Int]) {
   xs.retain((_, _) => true)
   xs.retain{case (x, y) => true}
   ys.retain(_ => true)
-}
+}

scalafix/input/src/main/scala/fix/SetMapSrc.scala

@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.Stable"
+rule = "scala:fix.CrossCompat"
  */
 package fix
 

scalafix/input/src/main/scala/fix/TestsSrc.scala

@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.Stable"
+rule = "scala:fix.CrossCompat"
  */
 package fix
 

scalafix/input/src/main/scala/fix/TraversableSrc.scala

@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.Stable"
+rule = "scala:fix.NewCollections"
  */
 package fix
 

scalafix/input/src/main/scala/fix/TupleNZippedSrc.scala

@@ -1,5 +1,5 @@
 /*
-rule = "scala:fix.Stable"
+rule = "scala:fix.NewCollections"
  */
 package fix
 
@@ -33,4 +33,4 @@ object Collectionstrawman_v0_Tuple3Zipped {
     (List(1, 2, 3), Set(1, 2, 3), Array(1)).zipped
   }
   def coll(x: Int): List[Int] = ???
-}
+}

scalafix/output/src/main/scala/fix/CopyToBufferSrc.scala renamed to scalafix/output212/src/main/scala/fix/CopyToBufferSrc.scala

@@ -6,8 +6,6 @@ package fix
 import scala.collection.mutable
 
 class CopyToBufferSrc(xs: List[Int], b: mutable.Buffer[Int]) {
-
   b ++= xs
   b ++= xs ++ xs
-
 }

scalafix/output/src/main/scala/fix/ExperimentalSrc.scala renamed to scalafix/output212/src/main/scala/fix/ExperimentalSrc.scala

@@ -5,4 +5,4 @@ package fix
 
 class IterableSrc(it: Iterable[Int]) {
   it.iterator.sameElements(it)
-}
+}

scalafix/output/src/main/scala/fix/FoldSrc.scala renamed to scalafix/output212/src/main/scala/fix/FoldSrc.scala

@@ -9,4 +9,4 @@ class MethodRenames(xs: Map[Int, Int], ys: Set[Int]) {
   xs.filterInPlace{case (_, _) => true}
   xs.filterInPlace{case (x, y) => true}
   ys.filterInPlace(_ => true)
-}
+}

scalafix/output/src/main/scala/fix/LinearSeqSrc.scala renamed to scalafix/output212/src/main/scala/fix/LinearSeqSrc.scala

@@ -33,4 +33,4 @@ object Collectionstrawman_v0_Tuple3Zipped {
     List(1, 2, 3).lazyZip(Set(1, 2, 3)).lazyZip(Array(1))
   }
   def coll(x: Int): List[Int] = ???
-}
+}