Improved how to express dependencies

Add
- Constructor syntax for cross-scala-version dependencies (as rightfully requested on reddit) and encouraged over SBT's still supported operator syntax
- Add support for classifiers other than "sources"

4 files changed, 21 insertions, 11 deletions

diff --git a/stage2/AdminTasks.scala b/stage2/AdminTasks.scala
index 70b140e..bce0ae7 100644
--- a/stage2/AdminTasks.scala
+++ b/stage2/AdminTasks.scala
@@ -7,7 +7,7 @@ class AdminTasks(lib: Lib, args: Array[String]){
       args(1).split(",").toVector.map{
         d =>
           val v = d.split(":")
-          new MavenDependency(v(0),v(1),v(2))(lib.logger).classpath
+          new JavaDependency(v(0),v(1),v(2))(lib.logger).classpath
       }
     )
   }
@@ -15,7 +15,7 @@ class AdminTasks(lib: Lib, args: Array[String]){
   def ammonite = {
     val version = args.lift(1).getOrElse(constants.scalaVersion)
     val scalac = new ScalaCompilerDependency( version )
-    val d = MavenDependency(
+    val d = JavaDependency(
       "com.lihaoyi","ammonite-repl_2.11.7",args.lift(1).getOrElse("0.5.6")
     )
     // FIXME: this does not work quite yet, throws NoSuchFileException: /ammonite/repl/frontend/ReplBridge$.class
diff --git a/stage2/BasicBuild.scala b/stage2/BasicBuild.scala
index bee58dd..f8431ea 100644
--- a/stage2/BasicBuild.scala
+++ b/stage2/BasicBuild.scala
@@ -35,7 +35,7 @@ class Build(val context: Context) extends Dependency with TriggerLoop{
   // ========== meta data ==========
 
   def scalaVersion: String = constants.scalaVersion
-  final def scalaMajorVersion: String = scalaVersion.split("\\.").take(2).mkString(".")
+  final def scalaMajorVersion: String = lib.scalaMajorVersion(scalaVersion)
   def zincVersion = "0.3.9"
 
   def dependencies: Seq[Dependency] = Seq(
@@ -80,14 +80,25 @@ class Build(val context: Context) extends Dependency with TriggerLoop{
   }
   assertSourceDirectories()
 
-
-  /** SBT-like dependency builder DSL */
-  class GroupIdAndArtifactId( groupId: String, artifactId: String ){
-    def %(version: String) = new MavenDependency(groupId, artifactId, version)(lib.logger)
+  def ScalaDependency(
+    groupId: String, artifactId: String, version: String, classifier: Classifier = Classifier.none,
+    scalaVersion: String = scalaMajorVersion
+  ) = lib.ScalaDependency( groupId, artifactId, version, classifier, scalaVersion )
+
+  /** SBT-like dependency builder DSL for syntax compatibility */
+  class DependencyBuilder2( groupId: String, artifactId: String, scalaVersion: Option[String] ){
+    def %(version: String) = scalaVersion.map(
+      v => ScalaDependency(groupId, artifactId, version, scalaVersion = v)
+    ).getOrElse(
+      JavaDependency(groupId, artifactId, version)
+    )
   }
   implicit class DependencyBuilder(groupId: String){
-    def %%(artifactId: String) = new GroupIdAndArtifactId( groupId, artifactId++"_"++scalaMajorVersion )
-    def  %(artifactId: String) = new GroupIdAndArtifactId( groupId, artifactId )
+    def %%(artifactId: String) = new DependencyBuilder2( groupId, artifactId, Some(scalaMajorVersion) )
+    def  %(artifactId: String) = new DependencyBuilder2( groupId, artifactId, None )
+  }
+  implicit class DependencyBuilder3(d: JavaDependency){
+    def  %(classifier: String) = d.copy(classifier = Classifier(Some(classifier)))
   }
 
   final def BuildDependency(path: File) = cbt.BuildDependency(
diff --git a/stage2/BuildDependency.scala b/stage2/BuildDependency.scala
index f7b6b78..f400be7 100644
--- a/stage2/BuildDependency.scala
+++ b/stage2/BuildDependency.scala
@@ -28,7 +28,7 @@ case class BuildDependency(context: Context) extends TriggerLoop{
   final val updated = build.updated
 }
 /*
-case class DependencyOr(first: BuildDependency, second: MavenDependency) extends ProjectProxy with BuildDependencyBase{
+case class DependencyOr(first: BuildDependency, second: JavaDependency) extends ProjectProxy with BuildDependencyBase{
   val isFirst = new File(first.context.cwd).exists
   def triggerLoopFiles = if(isFirst) first.triggerLoopFiles else Seq()
   protected val delegate = if(isFirst) first else second
diff --git a/stage2/PackageBuild.scala b/stage2/PackageBuild.scala
index 4c4e478..2866b7c 100644
--- a/stage2/PackageBuild.scala
+++ b/stage2/PackageBuild.scala
@@ -1,6 +1,5 @@
 package cbt
 import java.io.File
-import java.net.URL
 import scala.collection.immutable.Seq
 abstract class PackageBuild(context: Context) extends BasicBuild(context) with ArtifactInfo{
   def `package`: Seq[File] = lib.concurrently( enableConcurrency )(