type-safe aliases for non cbt libraries

5 files changed, 30 insertions, 13 deletions

diff --git a/build/build.scala b/build/build.scala
index 3873d4f..0e7da30 100644
--- a/build/build.scala
+++ b/build/build.scala
@@ -13,7 +13,7 @@ class Build(val context: Context) extends Shared with Scalariform with PublishLo
     super.dependencies ++ Resolver(mavenCentral).bind(
       MavenDependency("org.eclipse.jgit", "org.eclipse.jgit", "4.2.0.201601211800-r"),
       ScalaDependency("org.scala-lang.modules","scala-xml",constants.scalaXmlVersion)
-    ) :+ libraries.reflect :+ libraries.eval
+    ) :+ libraries.cbt.reflect :+ libraries.cbt.eval
   }
 
   override def sources = Seq(
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
 }
diff --git a/stage2/libraries.scala b/stage2/libraries.scala
index ebc748d..3c4800d 100644
--- a/stage2/libraries.scala
+++ b/stage2/libraries.scala
@@ -7,13 +7,30 @@ class libraries( context: Context, scalaVersion: String, scalaMajorVersion: Stri
     ),
     None
   )
-  def captureArgs = dep( "capture_args" )
-  def eval = dep( "eval" )
-  def file = dep( "file" )
-  def proguard = dep( "proguard" )
-  def reflect = dep( "reflect" )
-  def common_0 = dep( "common-0" )
-  def common_1 = dep( "common-1" )
-  def interfaces = dep( "interfaces" )
-  def scalatestRunner = dep( "scalatest-runner" )
+  object cbt {
+    def captureArgs = dep( "capture_args" )
+    def common_0 = dep( "common-0" )
+    def common_1 = dep( "common-1" )
+    def eval = dep( "eval" )
+    def file = dep( "file" )
+    def interfaces = dep( "interfaces" )
+    def proguard = dep( "proguard" )
+    def reflect = dep( "reflect" )
+    def scalatestRunner = dep( "scalatest-runner" )
+  }
+  object scala {
+    private def _maven = ( g: String, a: String, v: String ) => {
+      MavenResolver(
+        context.cbtLastModified, context.paths.mavenCache, mavenCentral
+      )(
+          context.logger, context.transientCache, context.classLoaderCache
+        ) bindOne MavenDependency( g, a, v )
+    }
+
+    def library = _maven( "org.scala-lang", "scala-library", scalaVersion )
+    def reflect = _maven( "org.scala-lang", "scala-reflect", scalaVersion )
+    def compiler = _maven( "org.scala-lang", "scala-compiler", scalaVersion )
+    def xml = _maven( "org.scala-lang.modules", "scala-xml_" ++ scalaMajorVersion, "1.0.6" )
+    def parserCombinators = _maven( "org.scala-lang.modules", "scala-parser-combinators_" ++ scalaMajorVersion, "1.0.5" )
+  }
 }