diff options
| -rw-r--r-- | test/simple-fixed/build/build.scala | 42 | ||||
| -rw-r--r-- | test/simple/build/build.scala | 2 | ||||
| -rw-r--r-- | test/test.scala | 1 |
3 files changed, 23 insertions, 22 deletions
diff --git a/test/simple-fixed/build/build.scala b/test/simple-fixed/build/build.scala index 3f8eb48..e30b376 100644 --- a/test/simple-fixed/build/build.scala +++ b/test/simple-fixed/build/build.scala @@ -2,32 +2,32 @@ import cbt._ import scala.collection.immutable.Seq import java.io.File -// cbt:https://github.com/cvogt/cbt.git#bdd6d905807a8cee7655d436401e76196ec4fe67 +// 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"), - MavenResolver(context.cbtHasChanged,context.paths.mavenCache,MavenResolver.central).resolve( - ScalaDependency("com.typesafe.play", "play-json", "2.4.4"), - MavenDependency("joda-time", "joda-time", "2.9.2"), - // the below tests pom inheritance with dependencyManagement and variable substitution for pom properties - MavenDependency("org.eclipse.jgit", "org.eclipse.jgit", "4.2.0.201601211800-r"), - // the below tests pom inheritance with variable substitution for pom xml tag contents - MavenDependency("com.spotify", "missinglink-core", "0.1.1") - ), - MavenResolver( - context.cbtHasChanged, - context.paths.mavenCache, - MavenResolver.central, - MavenResolver.bintray("tpolecat"), - MavenResolver.sonatypeSnapshots - ).resolve( - "org.cvogt" %% "play-json-extensions" % "0.8.0", - "org.tpolecat" %% "tut-core" % "0.4.2", - "ai.x" %% "lens" % "1.0.0-SNAPSHOT" - ) + GitDependency("https://github.com/xdotai/diff.git", "7ad3920158828d72b9ecb1ba9746fe83e2643824") + ) + ++ + Resolver(mavenCentral).bind( + ScalaDependency("com.typesafe.play", "play-json", "2.4.4"), + MavenDependency("joda-time", "joda-time", "2.9.2"), + // the below tests pom inheritance with dependencyManagement and variable substitution for pom properties + MavenDependency("org.eclipse.jgit", "org.eclipse.jgit", "4.2.0.201601211800-r"), + // the below tests pom inheritance with variable substitution for pom xml tag contents + MavenDependency("com.spotify", "missinglink-core", "0.1.1") + ) + ++ + Resolver( + mavenCentral, + bintray("tpolecat"), + sonatypeSnapshots + ).bind( + "org.cvogt" %% "play-json-extensions" % "0.8.0", + "org.tpolecat" %% "tut-core" % "0.4.2", + "ai.x" %% "lens" % "1.0.0-SNAPSHOT" ) ) } diff --git a/test/simple/build/build.scala b/test/simple/build/build.scala index afd4f4f..c7eab6a 100644 --- a/test/simple/build/build.scala +++ b/test/simple/build/build.scala @@ -7,7 +7,7 @@ class Build(context: cbt.Context) extends BasicBuild(context){ super.dependencies ++ Seq( - GitDependency("https://github.com/xdotai/diff.git", "698717469b8dd86e8570b86354892be9c0654caf") + GitDependency("https://github.com/xdotai/diff.git", "05fdac13a177f74952b54171733be01c258594a8") ) ++ // FIXME: make the below less verbose Resolver( mavenCentral ).bind( diff --git a/test/test.scala b/test/test.scala index b425cfa..13fd44f 100644 --- a/test/test.scala +++ b/test/test.scala @@ -93,6 +93,7 @@ object Main{ new ConcurrentHashMap[AnyRef,ClassLoader], cache, cbtHome, + cbtHome, cbtHome ++ "/compatibilityTarget", null ) |