aboutsummaryrefslogtreecommitdiff
path: root/test/simple-fixed
diff options
context:
space:
mode:
authorChristopher Vogt <oss.nsp@cvogt.org>2016-06-01 20:41:58 -0400
committerChristopher Vogt <oss.nsp@cvogt.org>2016-06-01 21:50:05 -0400
commitdd5089e8f43e656300ebfea4f719e8be5e88084f (patch)
tree665b6026340583e3e334a274a04498a8488cfc82 /test/simple-fixed
parentffa7260b6f94a5bee4ce7974148333f70829b0c6 (diff)
downloadcbt-dd5089e8f43e656300ebfea4f719e8be5e88084f.tar.gz
cbt-dd5089e8f43e656300ebfea4f719e8be5e88084f.tar.bz2
cbt-dd5089e8f43e656300ebfea4f719e8be5e88084f.zip
Fix the tests, by adapting to recent CBT changes. (This was easier than I expected)
Diffstat (limited to 'test/simple-fixed')
-rw-r--r--test/simple-fixed/build/build.scala42
1 files changed, 21 insertions, 21 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"
)
)
}