Merge pull request #264 from cvogt/chris3

Chris3

6 files changed, 31 insertions, 7 deletions

diff --git a/test/library-test/Foo.scala b/test/library-test/Foo.scala
new file mode 100644
index 0000000..75c0780
--- /dev/null
+++ b/test/library-test/Foo.scala
@@ -0,0 +1,4 @@
+package lib_test
+object Foo{
+  def bar = "Hello, Foo Bar"
+}
diff --git a/test/library-test/build/build.scala b/test/library-test/build/build.scala
new file mode 100644
index 0000000..a6e61af
--- /dev/null
+++ b/test/library-test/build/build.scala
@@ -0,0 +1,21 @@
+import cbt._
+
+// cbt:https://github.com/cvogt/cbt.git#1f4f6097d3ca682d6fd20a7cc6dd277832350827
+class Build(val context: Context) extends BaseBuild{
+  override def dependencies =
+    super.dependencies ++ // don't forget super.dependencies here for scala-library, etc.
+    Seq(
+      // source dependency
+      // DirectoryDependency( projectDirectory ++ "/subProject" )
+    ) ++
+    // pick resolvers explicitly for individual dependencies (and their transitive dependencies)
+    Resolver( mavenCentral, sonatypeReleases ).bind(
+      // CBT-style Scala dependencies
+      // ScalaDependency( "com.lihaoyi", "ammonite-ops", "0.5.5" )
+      // MavenDependency( "com.lihaoyi", "ammonite-ops_2.11", "0.5.5" )
+
+      // SBT-style dependencies
+      // "com.lihaoyi" %% "ammonite-ops" % "0.5.5"
+      // "com.lihaoyi" % "ammonite-ops_2.11" % "0.5.5"
+    )
+}
diff --git a/test/simple-fixed/Main.scala b/test/simple-fixed/Main.scala
index 1c423ca..75f9349 100644
--- a/test/simple-fixed/Main.scala
+++ b/test/simple-fixed/Main.scala
@@ -1,6 +1,6 @@
-import ai.x.diff
+import lib_test.Foo
 import org.eclipse.jgit.lib.Ref
 import com.spotify.missinglink.ArtifactLoader
 object Main extends App{
-  println(diff.DiffShow.diff("a","b"))
+  println(Foo.bar)
 }
diff --git a/test/simple-fixed/build/build.scala b/test/simple-fixed/build/build.scala
index 42130ee..a2bd584 100644
--- a/test/simple-fixed/build/build.scala
+++ b/test/simple-fixed/build/build.scala
@@ -1,12 +1,11 @@
 import cbt._
 
-// cbt:https://github.com/cvogt/cbt.git#ca412e26d70a6615153136019b7966acb9939446
 class Build(context: cbt.Context) extends BasicBuild(context){
   override def dependencies = (
     super.dependencies
     ++
     Seq(
-      GitDependency("https://github.com/xdotai/diff.git", "7ad3920158828d72b9ecb1ba9746fe83e2643824")
+      GitDependency("https://github.com/cvogt/cbt.git", "908e05e296974fe67d8aaf9f094d97ff986905af", Some("test/library-test"))
     )
     ++
     Resolver(mavenCentral).bind(
diff --git a/test/simple/Main.scala b/test/simple/Main.scala
index 1c423ca..75f9349 100644
--- a/test/simple/Main.scala
+++ b/test/simple/Main.scala
@@ -1,6 +1,6 @@
-import ai.x.diff
+import lib_test.Foo
 import org.eclipse.jgit.lib.Ref
 import com.spotify.missinglink.ArtifactLoader
 object Main extends App{
-  println(diff.DiffShow.diff("a","b"))
+  println(Foo.bar)
 }
diff --git a/test/simple/build/build.scala b/test/simple/build/build.scala
index affe7f6..586daca 100644
--- a/test/simple/build/build.scala
+++ b/test/simple/build/build.scala
@@ -5,7 +5,7 @@ class Build(val context: cbt.Context) extends BaseBuild{
     super.dependencies
     ++
     Seq(
-      GitDependency("https://github.com/xdotai/diff.git", "05fdac13a177f74952b54171733be01c258594a8")
+      GitDependency("https://github.com/cvogt/cbt.git", "908e05e296974fe67d8aaf9f094d97ff986905af", Some("test/library-test"))
     ) ++
     // FIXME: make the below less verbose
     Resolver( mavenCentral ).bind(