From e614bf22c6a4b09962e44bb20d880c1b4107df6d Mon Sep 17 00:00:00 2001
From: Christopher Vogt <oss.nsp@cvogt.org>
Date: Wed, 29 Mar 2017 09:30:32 -0400
Subject: type-safe aliases for non cbt libraries

---
 libraries/common-1/build/build.scala | 2 +-
 libraries/file/build/build.scala     | 2 +-
 libraries/reflect/build/build.scala  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'libraries')

diff --git a/libraries/common-1/build/build.scala b/libraries/common-1/build/build.scala
index 247fd01..3d7868d 100644
--- a/libraries/common-1/build/build.scala
+++ b/libraries/common-1/build/build.scala
@@ -4,5 +4,5 @@ import cbt_internal._
 class Build(val context: Context) extends Library{
   override def inceptionYear = 2017
   override def description = "classes shared by multiple cbt libraries and needed in stage 1"
-  override def dependencies = super.dependencies :+ libraries.common_0 :+ libraries.interfaces
+  override def dependencies = super.dependencies :+ libraries.cbt.common_0 :+ libraries.cbt.interfaces
 }
diff --git a/libraries/file/build/build.scala b/libraries/file/build/build.scala
index d9017a1..eb7cabf 100644
--- a/libraries/file/build/build.scala
+++ b/libraries/file/build/build.scala
@@ -4,5 +4,5 @@ import cbt_internal._
 class Build(val context: Context) extends Library{
   override def inceptionYear = 2017
   override def description = "helpers to work with java io and nio"
-  override def dependencies = super.dependencies :+ libraries.common_1
+  override def dependencies = super.dependencies :+ libraries.cbt.common_1
 }
diff --git a/libraries/reflect/build/build.scala b/libraries/reflect/build/build.scala
index 3b6658a..77e0460 100644
--- a/libraries/reflect/build/build.scala
+++ b/libraries/reflect/build/build.scala
@@ -4,5 +4,5 @@ import cbt_internal._
 class Build(val context: Context) extends Library{
   override def inceptionYear = 2017
   override def description = "discover classes on your classpath and invoke methods reflectively, preventing System.exit"
-  override def dependencies = super.dependencies :+ libraries.file :+ libraries.common_1
+  override def dependencies = super.dependencies :+ libraries.cbt.file :+ libraries.cbt.common_1
 }
-- 
cgit v1.2.3


From 8016298a6ae89ed1c8a45bde87411db4a2daf86f Mon Sep 17 00:00:00 2001
From: Christopher Vogt <oss.nsp@cvogt.org>
Date: Wed, 29 Mar 2017 10:47:21 -0400
Subject: use scalariform from github master which fixes indentation bug

---
 libraries/file/file.scala                 | 12 ++++++------
 plugins/scalariform/build/build.scala     |  6 +-----
 ports/scalariform/build/build.scala       | 26 ++++++++++++++++++++++++++
 ports/scalariform/build/build/build.scala |  5 +++++
 stage2/ports.scala                        |  1 +
 5 files changed, 39 insertions(+), 11 deletions(-)
 create mode 100644 ports/scalariform/build/build.scala
 create mode 100644 ports/scalariform/build/build/build.scala

(limited to 'libraries')

diff --git a/libraries/file/file.scala b/libraries/file/file.scala
index f20c9a8..900e9ec 100644
--- a/libraries/file/file.scala
+++ b/libraries/file/file.scala
@@ -83,12 +83,12 @@ trait Module {
       val duplicateFiles = ( relatives diff relatives.distinct ).distinct
       assert(
         duplicateFiles.isEmpty, {
-        val rs = relatives.toSet
-        "Conflicting:\n\n" +
-          map.filter( rs contains _._2 ).groupBy( _._2 ).mapValues( _.map( _._1 ).sorted ).toSeq.sortBy( _._1 ).map {
-            case ( name, files ) => s"$name:\n" ++ files.mkString( "\n" )
-          }.mkString( "\n\n" )
-      }
+          val rs = relatives.toSet
+          "Conflicting:\n\n" +
+            map.filter( rs contains _._2 ).groupBy( _._2 ).mapValues( _.map( _._1 ).sorted ).toSeq.sortBy( _._1 ).map {
+              case ( name, files ) => s"$name:\n" ++ files.mkString( "\n" )
+            }.mkString( "\n\n" )
+        }
       )
     }
     map
diff --git a/plugins/scalariform/build/build.scala b/plugins/scalariform/build/build.scala
index 5910b41..80f3966 100644
--- a/plugins/scalariform/build/build.scala
+++ b/plugins/scalariform/build/build.scala
@@ -1,9 +1,5 @@
 import cbt._
 
 class Build(val context: Context) extends Plugin {
-  override def dependencies =
-    super.dependencies ++
-    Resolver( mavenCentral ).bind(
-      ScalaDependency("org.scalariform", "scalariform", "0.1.8")
-    )
+  override def dependencies = super.dependencies :+ ports.scalariform
 }
diff --git a/ports/scalariform/build/build.scala b/ports/scalariform/build/build.scala
new file mode 100644
index 0000000..c2ade6b
--- /dev/null
+++ b/ports/scalariform/build/build.scala
@@ -0,0 +1,26 @@
+package migration_manager_build
+import cbt._
+class Build(val context: Context) extends AdvancedScala{ outer =>
+  override def dependencies = Seq( libraries.scala.xml, libraries.scala.parserCombinators )
+
+  val scalariform = GitDependency.checkout(
+    "https://github.com/scala-ide/scalariform.git", "f53978c60579fa834ac9e56986a6133c0a621bfd"
+  )
+
+  override def sources = Seq(
+    scalariform / "scalariform" / "src" / "main" / "scala" / "scalariform"
+  )
+
+  override def scalacOptions = super.scalacOptions ++ Seq(
+    "-language:implicitConversions", "-language:reflectiveCalls"
+  )
+
+  override def test = new BasicBuild( context ) with ScalaTest{
+    override def target = outer.target / "test"
+    override def dependencies = super.dependencies :+ outer
+    override def scalacOptions = outer.scalacOptions
+    override def sources = Seq(
+      scalariform / "scalariform" / "src" / "test" / "scala" / "scalariform"
+    )
+  }
+}
diff --git a/ports/scalariform/build/build/build.scala b/ports/scalariform/build/build/build.scala
new file mode 100644
index 0000000..d9eecf9
--- /dev/null
+++ b/ports/scalariform/build/build/build.scala
@@ -0,0 +1,5 @@
+package scalariform_build.build
+import cbt._
+class Build(val context: Context) extends BuildBuild{
+  override def dependencies = super.dependencies :+ plugins.scalaTest
+}
diff --git a/stage2/ports.scala b/stage2/ports.scala
index e7e3863..460a255 100644
--- a/stage2/ports.scala
+++ b/stage2/ports.scala
@@ -8,4 +8,5 @@ class ports( context: Context, scalaVersion: String ) {
     None
   )
   def mima = dep( "migration-manager" )
+  def scalariform = dep( "scalariform" )
 }
-- 
cgit v1.2.3


From c220ef8d12e77ce6af6fafde3b388fc3e334b380 Mon Sep 17 00:00:00 2001
From: Christopher Vogt <oss.nsp@cvogt.org>
Date: Sun, 2 Apr 2017 00:13:25 -0400
Subject: scalatest plugin now does not need import anymore

---
 build/build.scala                                  |  1 +
 examples/scalatest-example/build/build/build.scala |  1 -
 libraries/eval/build/build/build.scala             |  5 -----
 plugins/scalatest/.gitignore                       |  1 -
 plugins/scalatest/ScalaTest.scala                  | 13 -------------
 plugins/scalatest/build/build.scala                | 14 --------------
 ports/scalariform/build/build/build.scala          |  5 -----
 stage2/plugins.scala                               |  1 -
 stage2/plugins/ScalaTest.scala                     | 11 +++++++++++
 test/test.scala                                    |  1 -
 10 files changed, 12 insertions(+), 41 deletions(-)
 delete mode 100644 libraries/eval/build/build/build.scala
 delete mode 100644 plugins/scalatest/.gitignore
 delete mode 100644 plugins/scalatest/ScalaTest.scala
 delete mode 100644 plugins/scalatest/build/build.scala
 delete mode 100644 ports/scalariform/build/build/build.scala
 create mode 100644 stage2/plugins/ScalaTest.scala

(limited to 'libraries')

diff --git a/build/build.scala b/build/build.scala
index 0e7da30..c596245 100644
--- a/build/build.scala
+++ b/build/build.scala
@@ -24,6 +24,7 @@ class Build(val context: Context) extends Shared with Scalariform with PublishLo
     Seq(
       context.cbtHome / "stage2" / "DirectoryDependency.scala",
       context.cbtHome / "stage2" / "LazyDependency.scala",
+      context.cbtHome / "stage2" / "plugins" / "ScalaTest.scala",
       context.cbtHome / "stage2" / "libraries.scala",
       context.cbtHome / "stage2" / "plugins.scala",
       context.cbtHome / "stage2" / "ports.scala"
diff --git a/examples/scalatest-example/build/build/build.scala b/examples/scalatest-example/build/build/build.scala
index d641b51..c7b1b2b 100644
--- a/examples/scalatest-example/build/build/build.scala
+++ b/examples/scalatest-example/build/build/build.scala
@@ -2,7 +2,6 @@ import cbt._
 
 class Build(val context: Context) extends BuildBuild{
   override def dependencies = super.dependencies ++ Seq(
-    plugins.scalaTest,
     plugins.sbtLayout
   )
 }
diff --git a/libraries/eval/build/build/build.scala b/libraries/eval/build/build/build.scala
deleted file mode 100644
index af4eb64..0000000
--- a/libraries/eval/build/build/build.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-import cbt._
-
-class Build(val context: Context) extends BuildBuild{
-  override def dependencies = super.dependencies :+ plugins.scalaTest
-}
diff --git a/plugins/scalatest/.gitignore b/plugins/scalatest/.gitignore
deleted file mode 100644
index 3cd6ea0..0000000
--- a/plugins/scalatest/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-src_generated/BuildInfo.scala
diff --git a/plugins/scalatest/ScalaTest.scala b/plugins/scalatest/ScalaTest.scala
deleted file mode 100644
index dc67183..0000000
--- a/plugins/scalatest/ScalaTest.scala
+++ /dev/null
@@ -1,13 +0,0 @@
-package cbt
-import java.io.File
-trait ScalaTest extends BaseBuild{
-  override def dependencies = super.dependencies :+ libraries.scalatestRunner
-  override def run: ExitCode = {
-    classLoader.loadClass( "cbt.scalatest.Runner" ).method(
-      "run", classOf[Array[File]], classOf[ClassLoader]
-    ).invoke( null, exportedClasspath.files.toArray, classLoader )
-    ExitCode.Success
-  }
-    ScalaDependency("org.scalatest","scalatest",cbt_plugins.scalaTest.BuildInfo.scalaTestVersion)
-  )
-}
diff --git a/plugins/scalatest/build/build.scala b/plugins/scalatest/build/build.scala
deleted file mode 100644
index 7e33ca2..0000000
--- a/plugins/scalatest/build/build.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-import cbt._
-
-class Build(val context: Context) extends GenerateBuildInfo{
-  def scalaTestVersion = "2.2.6"
-  override def dependencies = (
-    super.dependencies
-    :+ context.cbtDependency
-    ScalaDependency("org.scalatest","scalatest",scalaTestVersion)
-  )
-  override def buildInfo = super.buildInfo.copy(
-    s"""def scalaTestVersion = "$scalaTestVersion"""",
-    Some("cbt_plugins.scalaTest")
-  )
-}
diff --git a/ports/scalariform/build/build/build.scala b/ports/scalariform/build/build/build.scala
deleted file mode 100644
index d9eecf9..0000000
--- a/ports/scalariform/build/build/build.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-package scalariform_build.build
-import cbt._
-class Build(val context: Context) extends BuildBuild{
-  override def dependencies = super.dependencies :+ plugins.scalaTest
-}
diff --git a/stage2/plugins.scala b/stage2/plugins.scala
index ec01d86..d82740f 100644
--- a/stage2/plugins.scala
+++ b/stage2/plugins.scala
@@ -16,7 +16,6 @@ class plugins( context: Context, scalaVersion: String ) {
   final lazy val scalaJs = plugin( "scalajs" )
   final lazy val scalapb = plugin( "scalapb" )
   final lazy val scalariform = plugin( "scalariform" )
-  final lazy val scalaTest = plugin( "scalatest" )
   final lazy val sonatypeRelease = plugin( "sonatype-release" )
   final lazy val uberJar = plugin( "uber-jar" )
   final lazy val wartremover = plugin( "wartremover" )
diff --git a/stage2/plugins/ScalaTest.scala b/stage2/plugins/ScalaTest.scala
new file mode 100644
index 0000000..29a0777
--- /dev/null
+++ b/stage2/plugins/ScalaTest.scala
@@ -0,0 +1,11 @@
+package cbt
+import java.io.File
+trait ScalaTest extends BaseBuild {
+  override def dependencies = super.dependencies :+ libraries.cbt.scalatestRunner
+  override def run: ExitCode = {
+    classLoader.loadClass( "cbt.scalatest.Runner" ).method(
+      "run", classOf[Array[File]], classOf[ClassLoader]
+    ).invoke( null, exportedClasspath.files.toArray, classLoader )
+    ExitCode.Success
+  }
+}
diff --git a/test/test.scala b/test/test.scala
index f942375..0208637 100644
--- a/test/test.scala
+++ b/test/test.scala
@@ -254,7 +254,6 @@ object Main{
     compile("../plugins/scalafmt")
     compile("../plugins/scalajs")
     compile("../plugins/scalariform")
-    compile("../plugins/scalatest")
     compile("../plugins/wartremover")
     compile("../plugins/uber-jar")
     compile("../plugins/scalafix-compiler-plugin")
-- 
cgit v1.2.3