From 95ac8ac55ddd5701b6c5623261c32cb4f61be48e Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Mon, 3 Oct 2016 23:09:07 -0400 Subject: change git dependencies to be easier manageable when cbt becomes source incompatible --- test/simple-fixed/Main.scala | 4 ++-- test/simple-fixed/build/build.scala | 3 +-- test/simple/Main.scala | 4 ++-- test/simple/build/build.scala | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) (limited to 'test') 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( -- cgit v1.2.3