diff options
author | Christopher Vogt <oss.nsp@cvogt.org> | 2017-03-11 13:28:42 -0500 |
---|---|---|
committer | Christopher Vogt <oss.nsp@cvogt.org> | 2017-03-11 14:15:38 -0500 |
commit | c7a5c5d7e23355ea14e8c095f750b47f308c032f (patch) | |
tree | acda495118a62aad82feccbfe3ff746ff9e435c2 /test | |
parent | f890b14098a588fb4e016afc6932edf89f8ef1f7 (diff) | |
download | cbt-c7a5c5d7e23355ea14e8c095f750b47f308c032f.tar.gz cbt-c7a5c5d7e23355ea14e8c095f750b47f308c032f.tar.bz2 cbt-c7a5c5d7e23355ea14e8c095f750b47f308c032f.zip |
remove duplication between simple and simple-fixed test
Diffstat (limited to 'test')
-rw-r--r-- | test/simple-fixed/Main.scala | 2 | ||||
-rw-r--r-- | test/simple-fixed/build/build.scala | 18 | ||||
-rw-r--r-- | test/simple/Main.scala | 3 | ||||
-rw-r--r-- | test/simple/build/build.scala | 5 |
4 files changed, 2 insertions, 26 deletions
diff --git a/test/simple-fixed/Main.scala b/test/simple-fixed/Main.scala index 75f9349..54c764c 100644 --- a/test/simple-fixed/Main.scala +++ b/test/simple-fixed/Main.scala @@ -1,6 +1,4 @@ import lib_test.Foo -import org.eclipse.jgit.lib.Ref -import com.spotify.missinglink.ArtifactLoader object Main extends App{ println(Foo.bar) } diff --git a/test/simple-fixed/build/build.scala b/test/simple-fixed/build/build.scala index b46c337..0215c43 100644 --- a/test/simple-fixed/build/build.scala +++ b/test/simple-fixed/build/build.scala @@ -7,23 +7,5 @@ class Build(context: cbt.Context) extends BasicBuild(context){ Seq( GitDependency("https://github.com/cvogt/cbt.git", "f11b8318b85f16843d8cfa0743f64c1576614ad6", Some("test/library-test")) ) - ++ - 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", - "ai.x" %% "lens" % "1.0.0" - ) ) } diff --git a/test/simple/Main.scala b/test/simple/Main.scala index 75f9349..c742110 100644 --- a/test/simple/Main.scala +++ b/test/simple/Main.scala @@ -1,6 +1,5 @@ -import lib_test.Foo import org.eclipse.jgit.lib.Ref import com.spotify.missinglink.ArtifactLoader object Main extends App{ - println(Foo.bar) + println("hello, world") } diff --git a/test/simple/build/build.scala b/test/simple/build/build.scala index a132dd1..517dd83 100644 --- a/test/simple/build/build.scala +++ b/test/simple/build/build.scala @@ -4,9 +4,6 @@ class Build(val context: cbt.Context) extends BaseBuild{ override def dependencies = ( super.dependencies ++ - Seq( - GitDependency("https://github.com/cvogt/cbt.git", "f11b8318b85f16843d8cfa0743f64c1576614ad6", Some("test/library-test")) - ) ++ // FIXME: make the below less verbose Resolver( mavenCentral ).bind( ScalaDependency("com.typesafe.play", "play-json", "2.4.4"), @@ -38,6 +35,6 @@ class Build(val context: cbt.Context) extends BaseBuild{ "ai.x" %% "lens" % "1.0.0" ) ) - + def printArgs = context.args.mkString(" ") } |