diff options
author | Jan Christopher Vogt <oss.nsp@cvogt.org> | 2016-10-04 09:15:04 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-04 09:15:04 -0400 |
commit | 3ccf39b2c5cddd6263d6dc170c3bc62137d0c5b8 (patch) | |
tree | d775b1b2a90c7594be8d6a2b7334f2b3196c9959 | |
parent | 88bfbeebfbe6a92dfcf26393e0f36f1fefc3d322 (diff) | |
parent | 95ac8ac55ddd5701b6c5623261c32cb4f61be48e (diff) | |
download | cbt-3ccf39b2c5cddd6263d6dc170c3bc62137d0c5b8.tar.gz cbt-3ccf39b2c5cddd6263d6dc170c3bc62137d0c5b8.tar.bz2 cbt-3ccf39b2c5cddd6263d6dc170c3bc62137d0c5b8.zip |
Merge pull request #264 from cvogt/chris3
Chris3
-rw-r--r-- | compatibility/BuildInterface.java | 2 | ||||
-rw-r--r-- | examples/multi-project-example/build/build/build.scala | 2 | ||||
-rw-r--r-- | examples/multi-project-example/common/build/build.scala | 2 | ||||
-rw-r--r-- | examples/multi-project-example/common/build/build/build.scala | 2 | ||||
-rw-r--r-- | examples/multi-project-example/sub1/build/build.scala | 2 | ||||
-rw-r--r-- | examples/multi-project-example/sub1/build/build/build.scala | 2 | ||||
-rw-r--r-- | examples/multi-project-example/sub2/build/build.scala | 2 | ||||
-rw-r--r-- | examples/multi-project-example/sub2/build/build/build.scala | 2 | ||||
-rw-r--r-- | stage1/resolver.scala | 4 | ||||
-rw-r--r-- | stage2/BasicBuild.scala | 2 | ||||
-rw-r--r-- | test/library-test/Foo.scala | 4 | ||||
-rw-r--r-- | test/library-test/build/build.scala | 21 | ||||
-rw-r--r-- | test/simple-fixed/Main.scala | 4 | ||||
-rw-r--r-- | test/simple-fixed/build/build.scala | 3 | ||||
-rw-r--r-- | test/simple/Main.scala | 4 | ||||
-rw-r--r-- | test/simple/build/build.scala | 2 |
16 files changed, 42 insertions, 18 deletions
diff --git a/compatibility/BuildInterface.java b/compatibility/BuildInterface.java index 636ded9..f061832 100644 --- a/compatibility/BuildInterface.java +++ b/compatibility/BuildInterface.java @@ -1,7 +1,7 @@ package cbt; import java.io.*; -public interface BuildInterface extends Dependency{ +public abstract class BuildInterface implements Dependency{ public abstract BuildInterface copy(Context context); // needed to configure builds public abstract String scalaVersion(); // needed to propagate scalaVersion to dependent builds public abstract String[] crossScalaVersionsArray(); // FIXME: this probably can't use Scala classes diff --git a/examples/multi-project-example/build/build/build.scala b/examples/multi-project-example/build/build/build.scala index fc0ceb6..be72a13 100644 --- a/examples/multi-project-example/build/build/build.scala +++ b/examples/multi-project-example/build/build/build.scala @@ -1,5 +1,5 @@ import cbt._ -// cbt:https://github.com/cvogt/cbt.git#75c32537cd8f29f9d12db37bf06ad942806f0239 + class Build(val context: Context) extends BuildBuild{ override def dependencies = super.dependencies ++ // don't forget super.dependencies here diff --git a/examples/multi-project-example/common/build/build.scala b/examples/multi-project-example/common/build/build.scala index 1b1cc90..0fbea50 100644 --- a/examples/multi-project-example/common/build/build.scala +++ b/examples/multi-project-example/common/build/build.scala @@ -1,3 +1,3 @@ import cbt._ -// cbt:https://github.com/cvogt/cbt.git#75c32537cd8f29f9d12db37bf06ad942806f0239 + class Build(val context: Context) extends SharedCbtBuild diff --git a/examples/multi-project-example/common/build/build/build.scala b/examples/multi-project-example/common/build/build/build.scala index 2deaf5a..efeeb77 100644 --- a/examples/multi-project-example/common/build/build/build.scala +++ b/examples/multi-project-example/common/build/build/build.scala @@ -1,5 +1,5 @@ import cbt._ -// cbt:https://github.com/cvogt/cbt.git#75c32537cd8f29f9d12db37bf06ad942806f0239 + class Build(val context: Context) extends BuildBuild{ override def dependencies = super.dependencies ++ // don't forget super.dependencies here diff --git a/examples/multi-project-example/sub1/build/build.scala b/examples/multi-project-example/sub1/build/build.scala index dd5fdee..2c39a54 100644 --- a/examples/multi-project-example/sub1/build/build.scala +++ b/examples/multi-project-example/sub1/build/build.scala @@ -1,5 +1,5 @@ import cbt._ -// cbt:https://github.com/cvogt/cbt.git#75c32537cd8f29f9d12db37bf06ad942806f0239 + class Build(val context: Context) extends SharedCbtBuild{ override def dependencies = super.dependencies ++ // don't forget super.dependencies here diff --git a/examples/multi-project-example/sub1/build/build/build.scala b/examples/multi-project-example/sub1/build/build/build.scala index 2deaf5a..efeeb77 100644 --- a/examples/multi-project-example/sub1/build/build/build.scala +++ b/examples/multi-project-example/sub1/build/build/build.scala @@ -1,5 +1,5 @@ import cbt._ -// cbt:https://github.com/cvogt/cbt.git#75c32537cd8f29f9d12db37bf06ad942806f0239 + class Build(val context: Context) extends BuildBuild{ override def dependencies = super.dependencies ++ // don't forget super.dependencies here diff --git a/examples/multi-project-example/sub2/build/build.scala b/examples/multi-project-example/sub2/build/build.scala index dd5fdee..2c39a54 100644 --- a/examples/multi-project-example/sub2/build/build.scala +++ b/examples/multi-project-example/sub2/build/build.scala @@ -1,5 +1,5 @@ import cbt._ -// cbt:https://github.com/cvogt/cbt.git#75c32537cd8f29f9d12db37bf06ad942806f0239 + class Build(val context: Context) extends SharedCbtBuild{ override def dependencies = super.dependencies ++ // don't forget super.dependencies here diff --git a/examples/multi-project-example/sub2/build/build/build.scala b/examples/multi-project-example/sub2/build/build/build.scala index 2deaf5a..efeeb77 100644 --- a/examples/multi-project-example/sub2/build/build/build.scala +++ b/examples/multi-project-example/sub2/build/build/build.scala @@ -1,5 +1,5 @@ import cbt._ -// cbt:https://github.com/cvogt/cbt.git#75c32537cd8f29f9d12db37bf06ad942806f0239 + class Build(val context: Context) extends BuildBuild{ override def dependencies = super.dependencies ++ // don't forget super.dependencies here diff --git a/stage1/resolver.scala b/stage1/resolver.scala index c2ebb62..13e8e52 100644 --- a/stage1/resolver.scala +++ b/stage1/resolver.scala @@ -7,7 +7,7 @@ import scala.xml._ import scala.concurrent._ import scala.concurrent.duration._ -abstract class DependencyImplementation extends Dependency{ +trait DependencyImplementation extends Dependency{ implicit protected def logger: Logger protected def lib = new Stage1Lib(logger) @@ -196,7 +196,7 @@ object MavenDependency{ // FIXME: take MavenResolver instead of mavenCache and repositories separately case class BoundMavenDependency( cbtHasChanged: Boolean, mavenCache: File, mavenDependency: MavenDependency, repositories: Seq[URL] -)(implicit val logger: Logger) extends DependencyImplementation with ArtifactInfo{ +)(implicit val logger: Logger) extends ArtifactInfo with DependencyImplementation{ val MavenDependency( groupId, artifactId, version, classifier ) = mavenDependency assert( Option(groupId).collect{ diff --git a/stage2/BasicBuild.scala b/stage2/BasicBuild.scala index 98deddc..007c27e 100644 --- a/stage2/BasicBuild.scala +++ b/stage2/BasicBuild.scala @@ -10,7 +10,7 @@ import java.util.jar._ import scala.util._ class BasicBuild(val context: Context) extends BaseBuild -trait BaseBuild extends DependencyImplementation with BuildInterface with TriggerLoop with SbtDependencyDsl{ +trait BaseBuild extends BuildInterface with DependencyImplementation with TriggerLoop with SbtDependencyDsl{ def context: Context // library available to builds 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( |