keep scalafix/ folder, Unstable => Roughtly

Author: MasseGuillaume

CONTRIBUTING.md

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
@@ -18,10 +18,6 @@ set -e
 
 RELEASE_COMBO=true
 
-if [[ "$TEST_SCALAFIX" == "true" ]]; then
-  sbt scalafixTests/test
-fi
-
 if [ "$SCALAJS_VERSION" = "" ]; then
   if [[ "$TEST_SCALAFIX" == "true" ]]; then
     projectPrefix="scalafixRules"
@@ -32,9 +28,20 @@ else
   projectPrefix="compatJS"
 fi
 
+if [[ "$TEST_SCALAFIX" == "true" ]]; then
+  crossScalaVersion="noop"
+  testProjectPrefix="scalafixTests"
+else
+  crossScalaVersion="++$TRAVIS_SCALA_VERSION"
+  testProjectPrefix="$projectPrefix"
+fi
+
 verPat="[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9-]+)?"
 tagPat="^v$verPat(#.*)?$"
 
+publishVersion="noop"
+publishTask="noop"
+
 if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
   tagVer=$(echo $TRAVIS_TAG | sed s/#.*// | sed s/^v//)
   publishVersion='set every version := "'$tagVer'"'
@@ -55,10 +62,4 @@ if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
   fi
 fi
 
-sbt -Dhttps.protocols=TLSv1.2 \
-  "++$TRAVIS_SCALA_VERSION" \
-  "$publishVersion" \
-  "$projectPrefix/clean" \
-  "$projectPrefix/test" \
-  "$projectPrefix/publishLocal" \
-  "$publishTask"
+sbt -Dhttps.protocols=TLSv1.2 -sbt-dir=/home/travis/.sbt ";$crossScalaVersion ;$publishVersion ;$projectPrefix/clean ;$testProjectPrefix/test ;$projectPrefix/publishLocal ;$publishTask"

admin/build.sh

@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
 #
 # Encrypt sonatype credentials so that they can be
 # decrypted in trusted builds on Travis CI.

admin/encryptEnvVars.sh

@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
 #
 # Generates a key pair for this repository to sign artifacts.
 # Encrypt the private key and its passphrase in trusted builds

admin/genKeyPair.sh

@@ -49,7 +49,7 @@ lazy val compatJVM = compat.jvm
 lazy val compatJS  = compat.js
 
 lazy val scalafixRules = project
-  .in(file("scalafix-rules"))
+  .in(file("scalafix/rules"))
   .settings(scalaModuleSettings)
   .settings(scalaModuleSettingsJVM)
   .settings(
@@ -61,31 +61,31 @@ lazy val scalafixRules = project
 // == Scalafix Test Setup ==
 
 lazy val scalafixInput = project
-  .in(file("scalafix-input"))
+  .in(file("scalafix/input"))
   .settings(dontPublish)
   .settings(
     scalaVersion := scalafixScala212,
     scalafixSourceroot := sourceDirectory.in(Compile).value
   )
 
 lazy val scalafixOutput212 = project
-  .in(file("scalafix-output212"))
+  .in(file("scalafix/output212"))
   .settings(scalaVersion := scalafixScala212)
   .settings(dontPublish)
   .dependsOn(compatJVM)
 
 lazy val scalafixOutput213 = project
-  .in(file("scalafix-output213"))
+  .in(file("scalafix/output213"))
   .settings(scala213Settings)
   .settings(dontPublish)
 
 lazy val scalafixOutput213Failure = project
-  .in(file("scalafix-output213-failure"))
+  .in(file("scalafix/output213-failure"))
   .settings(scala213Settings)
   .settings(dontPublish)
 
 lazy val scalafixTests = project
-  .in(file("scalafix-tests"))
+  .in(file("scalafix/tests"))
   .settings(dontPublish)
   .settings(
     scalaVersion := scalafixScala212,
@@ -128,5 +128,9 @@ lazy val scala213Settings = Seq(
 
 // required by sbt-scala-module
 inThisBuild(Seq(
-  crossScalaVersions := Seq(scala212, scala213, "2.11.12")
+  crossScalaVersions := Seq(scala212, scala213, "2.11.12"),
+  commands += Command.command("noop") { state =>
+    println("noop")
+    state
+  }
 ))

build.sbt

@@ -1,5 +1,3 @@
-import coursier.util.Properties.{version => coursierVersion}
-
 if (System.getProperty("java.version").startsWith("1."))
   Seq()
 else
@@ -10,8 +8,7 @@ else
 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.portable-scala"     % "sbt-scalajs-crossproject" % "0.5.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")
-addSbtPlugin("io.get-coursier"        % "sbt-coursier"             % coursierVersion)

project/plugins.sbt

@@ -0,0 +1,8 @@
+/*
+rule = "scala:fix.RoughlyMapValues"
+ */
+package fix
+
+class RoughlyMapValuesSrc(map: Map[Int, Int]) {
+  map.mapValues(_ + 1)
+}

project/project/plugins.sbt

@@ -1,9 +1,9 @@
 /*
-rule = "scala:fix.UnstableStreamToLazyList"
+rule = "scala:fix.RoughlyStreamToLazyList"
  */
 package fix
 
-class UnstableStreamToLazyListSrc() {
+class RoughlyStreamToLazyListSrc() {
   val s = Stream(1, 2, 3)
   s.append(List(4, 5, 6))
   1 #:: 2 #:: 3 #:: Stream.Empty

scalafix-input/src/main/scala/fix/UnstableMapValuesSrc.scala

@@ -0,0 +1,8 @@
+
+
+
+package fix
+
+class RoughlyMapValuesSrc(map: Map[Int, Int]) {
+  map.mapValues(_ + 1).toMap
+}

scalafix-output212/src/main/scala/fix/UnstableMapValuesSrc.scala

@@ -3,7 +3,7 @@
 
 package fix
 
-class UnstableStreamToLazyListSrc() {
+class RoughlyStreamToLazyListSrc() {
   val s = LazyList(1, 2, 3)
   s.lazyAppendedAll(List(4, 5, 6))
   1 #:: 2 #:: 3 #:: LazyList.Empty

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

@@ -9,7 +9,7 @@ import scala.meta._
  *
  * This rules is marked unstable since Map.mapValues was lazy
  */
-case class UnstableMapValues(index: SemanticdbIndex) extends SemanticRule(index, "UnstableMapValues") {
+case class RoughlyMapValues(index: SemanticdbIndex) extends SemanticRule(index, "RoughlyMapValues") {
   val mapMapValues =
     SymbolMatcher.exact(
       Symbol("_root_.scala.collection.immutable.MapLike#mapValues(Lscala/Function1;)Lscala/collection/immutable/Map;.")

scalafix-input/src/main/scala/fix/CanBuildFromNegSrc.scala renamed to scalafix/input/src/main/scala/fix/CanBuildFromNegSrc.scala

@@ -9,7 +9,7 @@ import scala.meta._
  * This rules is marked unstable since Stream is not strictly equivalent to LazyList.
  * LazyList has a lazy head but not Stream
  */
-case class UnstableStreamToLazyList(index: SemanticdbIndex) extends SemanticRule(index, "UnstableStreamToLazyList") {
+case class RoughlyStreamToLazyList(index: SemanticdbIndex) extends SemanticRule(index, "RoughlyStreamToLazyList") {
 
   val streamAppend = SymbolMatcher.normalized(
     Symbol("_root_.scala.collection.immutable.Stream.append.")

scalafix-input/src/main/scala/fix/CanBuildFromSrc.scala renamed to scalafix/input/src/main/scala/fix/CanBuildFromSrc.scala

@@ -1,5 +1,4 @@
 import scalafix._
-import scalafix.syntax._
 import scalafix.util._
 import scala.meta._