start modularizing cbt into libraries

this extracts certain parts of cbt into stand-alone libraries, which can
be published to maven and used outside of cbt.

This also adds scalariform for these parts of the code.

This slows down cbt’s own build a lot because of the number of projects
involved! So we’ll follow this by a bunch of performance tweak commits.

3 files changed, 10 insertions, 16 deletions

diff --git a/libraries/proguard/Proguard.scala b/libraries/proguard/Proguard.scala
index 7d57a77..ec5c2e9 100644
--- a/libraries/proguard/Proguard.scala
+++ b/libraries/proguard/Proguard.scala
@@ -29,8 +29,8 @@ object ProGuard {
 }
 case class ProGuard[T](
   main: Seq[String] => Int,
-  T:    Seq[File]   => T,
-  log:  String      => Unit = _ => ()
+  T:    Seq[File] => T,
+  log:  String => Unit = _ => ()
 ) {
 
   /**
@@ -160,9 +160,9 @@ case class ProGuard[T](
     private object argsFor {
       def apply[T: argsFor]( value: T ) = implicitly[argsFor[T]].apply( value )
       implicit object SeqFile extends argsFor[Seq[File]]( v => Some( Seq( v.map( _.getPath ).mkString( ":" ) ) ) )
-      implicit object File    extends argsFor[File]( v      => Some( Seq( v.getPath ) ) )
-      implicit object String  extends argsFor[String]( v    => Some( Seq( v ) ) )
-      implicit object Int     extends argsFor[Int]( i       => Some( Seq( i.toString ) ) )
+      implicit object File    extends argsFor[File]( v => Some( Seq( v.getPath ) ) )
+      implicit object String  extends argsFor[String]( v => Some( Seq( v ) ) )
+      implicit object Int     extends argsFor[Int]( i => Some( Seq( i.toString ) ) )
       implicit object Boolean
           extends argsFor[Boolean]( {
             case false => None
diff --git a/libraries/proguard/build/build.scala b/libraries/proguard/build/build.scala
index 3ca38b5..754de20 100644
--- a/libraries/proguard/build/build.scala
+++ b/libraries/proguard/build/build.scala
@@ -1,11 +1,12 @@
 package cbt_build.proguard
 import cbt._
+import cbt_internal._
 import java.nio.file.Files._
 import java.net._
 import java.io._
 import scala.xml._
 
-class Build(val context: Context) extends Scalafmt{
+class Build(val context: Context) extends Library{
   def description: String = "Type-safe scala wrapper to interfaces with ProGuard.main runner"
   def inceptionYear = 2017
 
@@ -14,11 +15,6 @@ class Build(val context: Context) extends Scalafmt{
     compile
   }
 
-  override def scalafmt = super.scalafmt.copy(
-    config = Scalafmt.cbtRecommendedConfig,
-    whiteSpaceInParenthesis = true
-  )
-
   override def compile = {
     // currently suffers from non-deterministic formatting. Try a few times to reproduce commit state.
     val formatted = scalafmt.apply.map(_.string).mkString("\n")
diff --git a/libraries/proguard/build/build/build.scala b/libraries/proguard/build/build/build.scala
index 7928cfa..5057404 100644
--- a/libraries/proguard/build/build/build.scala
+++ b/libraries/proguard/build/build/build.scala
@@ -1,13 +1,11 @@
-package cbt_build.proguard.build
+package proguard_build.build
 import cbt._
-class Build(val context: Context) extends BuildBuild{
+class Build(val context: Context) extends BuildBuild with CbtInternal{
   override def dependencies = (
     super.dependencies ++ // don't forget super.dependencies here for scala-library, etc.
     Resolver( mavenCentral, sonatypeReleases ).bind(
       ScalaDependency("org.scala-lang.modules","scala-xml","1.0.5"),
        "org.ccil.cowan.tagsoup" % "tagsoup" % "1.2.1"
-    ) ++ Seq(
-      plugins.scalafmt
-    )
+    ) ++ Seq( cbtInternal.library )
   )
 }