aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Vogt <oss.nsp@cvogt.org>2017-03-27 19:27:48 -0400
committerChristopher Vogt <oss.nsp@cvogt.org>2017-03-28 09:39:08 -0400
commitc9be8fe67010094d21505ca05ab1363a5abba06d (patch)
tree2eccb4a4ff43d8e8c7d58ff33daeeb9a04dc8b4d
parentc0e956df1e4c466f5c80282f1086b0589959ce2e (diff)
downloadcbt-c9be8fe67010094d21505ca05ab1363a5abba06d.tar.gz
cbt-c9be8fe67010094d21505ca05ab1363a5abba06d.tar.bz2
cbt-c9be8fe67010094d21505ca05ab1363a5abba06d.zip
rename Scalafix plugin in perparation for mirror based one
-rw-r--r--examples/scalafix-compiler-plugin-example/.scalafix.conf (renamed from examples/scalafix-example/.scalafix.conf)0
-rw-r--r--examples/scalafix-compiler-plugin-example/Main.scala (renamed from examples/scalafix-example/Main.scala)0
-rw-r--r--examples/scalafix-compiler-plugin-example/build/build.scala (renamed from examples/scalafix-example/build/build.scala)2
-rw-r--r--examples/scalafix-compiler-plugin-example/build/build/build.scala (renamed from examples/scalafix-example/build/build/build.scala)2
-rw-r--r--plugins/scalafix-compiler-plugin/Scalafix.scala (renamed from plugins/scalafix/Scalafix.scala)2
-rw-r--r--plugins/scalafix-compiler-plugin/build/build.scala (renamed from plugins/scalafix/build/build.scala)0
-rw-r--r--stage2/plugins.scala2
-rw-r--r--test/test.scala8
8 files changed, 8 insertions, 8 deletions
diff --git a/examples/scalafix-example/.scalafix.conf b/examples/scalafix-compiler-plugin-example/.scalafix.conf
index dbb79d7..dbb79d7 100644
--- a/examples/scalafix-example/.scalafix.conf
+++ b/examples/scalafix-compiler-plugin-example/.scalafix.conf
diff --git a/examples/scalafix-example/Main.scala b/examples/scalafix-compiler-plugin-example/Main.scala
index c82c77b..c82c77b 100644
--- a/examples/scalafix-example/Main.scala
+++ b/examples/scalafix-compiler-plugin-example/Main.scala
diff --git a/examples/scalafix-example/build/build.scala b/examples/scalafix-compiler-plugin-example/build/build.scala
index 776d1e0..9d85087 100644
--- a/examples/scalafix-example/build/build.scala
+++ b/examples/scalafix-compiler-plugin-example/build/build.scala
@@ -1,3 +1,3 @@
import cbt._
-class Build(val context: Context) extends BaseBuild with Scalafix
+class Build(val context: Context) extends BaseBuild with ScalafixCompilerPlugin
diff --git a/examples/scalafix-example/build/build/build.scala b/examples/scalafix-compiler-plugin-example/build/build/build.scala
index 404356f..5b6286b 100644
--- a/examples/scalafix-example/build/build/build.scala
+++ b/examples/scalafix-compiler-plugin-example/build/build/build.scala
@@ -1,5 +1,5 @@
import cbt._
class Build(val context: Context) extends BuildBuild {
- override def dependencies = super.dependencies :+ plugins.scalafix
+ override def dependencies = super.dependencies :+ plugins.scalafixCompilerPlugin
}
diff --git a/plugins/scalafix/Scalafix.scala b/plugins/scalafix-compiler-plugin/Scalafix.scala
index cf808d7..2a18c5d 100644
--- a/plugins/scalafix/Scalafix.scala
+++ b/plugins/scalafix-compiler-plugin/Scalafix.scala
@@ -5,7 +5,7 @@ import java.nio.file.Files._
import java.nio.file._
import java.io.File
-trait Scalafix extends BaseBuild {
+trait ScalafixCompilerPlugin extends BaseBuild {
def scalafixVersion = "0.3.1"
override def scalacOptions = super.scalacOptions ++
diff --git a/plugins/scalafix/build/build.scala b/plugins/scalafix-compiler-plugin/build/build.scala
index b25b54d..b25b54d 100644
--- a/plugins/scalafix/build/build.scala
+++ b/plugins/scalafix-compiler-plugin/build/build.scala
diff --git a/stage2/plugins.scala b/stage2/plugins.scala
index eca28f0..b1638da 100644
--- a/stage2/plugins.scala
+++ b/stage2/plugins.scala
@@ -5,7 +5,7 @@ class plugins( implicit context: Context ) {
final lazy val googleJavaFormat = plugin( "google-java-format" )
final lazy val proguard = plugin( "proguard" )
final lazy val sbtLayout = plugin( "sbt_layout" )
- final lazy val scalafix = plugin( "scalafix" )
+ final lazy val scalafixCompilerPlugin = plugin( "scalafix-compiler-plugin" )
final lazy val scalafmt = plugin( "scalafmt" )
final lazy val scalaJs = plugin( "scalajs" )
final lazy val scalapb = plugin( "scalapb" )
diff --git a/test/test.scala b/test/test.scala
index 5c107fe..3b296a1 100644
--- a/test/test.scala
+++ b/test/test.scala
@@ -257,7 +257,7 @@ object Main{
compile("../plugins/scalatest")
compile("../plugins/wartremover")
compile("../plugins/uber-jar")
- compile("../plugins/scalafix")
+ compile("../plugins/scalafix-compiler-plugin")
compile("../examples/scalafmt-example")
compile("../examples/scalariform-example")
compile("../examples/scalatest-example")
@@ -427,10 +427,10 @@ object Main{
}
{
- val sourceFile = cbtHome / "examples" / "scalafix-example" / "Main.scala"
+ val sourceFile = cbtHome / "examples" / "scalafix-compiler-plugin-example" / "Main.scala"
val sourceBefore = sourceFile.readAsString
- runCbt("../examples/scalafix-example", Seq("clean","force"))
- val res = runCbt("../examples/scalafix-example", Seq("compile"))
+ runCbt("../examples/scalafix-compiler-plugin-example", Seq("clean","force"))
+ val res = runCbt("../examples/scalafix-compiler-plugin-example", Seq("compile"))
assert(res.exit0)
val sourceAfter = sourceFile.readAsString
assert(!(sourceBefore contains "@volatile"))