diff options
author | Jan Christopher Vogt <oss.nsp@cvogt.org> | 2016-03-18 00:14:33 -0400 |
---|---|---|
committer | Jan Christopher Vogt <oss.nsp@cvogt.org> | 2016-03-18 00:14:33 -0400 |
commit | e7131a7672dc172dc1de3078b414632d58314ee8 (patch) | |
tree | db2715a94ba7afe8876a29f4d14078f7b8bea3a1 /stage1 | |
parent | d9bc8a824d4afd937a17090be1f334a42f476cad (diff) | |
parent | cb37198374fa25e2ac1f46ccd6fe3ba98d79dd24 (diff) | |
download | cbt-e7131a7672dc172dc1de3078b414632d58314ee8.tar.gz cbt-e7131a7672dc172dc1de3078b414632d58314ee8.tar.bz2 cbt-e7131a7672dc172dc1de3078b414632d58314ee8.zip |
Merge pull request #91 from cvogt/git-dependencies
Add support for git dependencies
Diffstat (limited to 'stage1')
-rw-r--r-- | stage1/Stage1.scala | 2 | ||||
-rw-r--r-- | stage1/logger.scala | 2 | ||||
-rw-r--r-- | stage1/resolver.scala | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/stage1/Stage1.scala b/stage1/Stage1.scala index 7702678..937d9b3 100644 --- a/stage1/Stage1.scala +++ b/stage1/Stage1.scala @@ -69,7 +69,7 @@ abstract class Stage1Base{ if( src.exists(newerThan(_, changeIndicator)) ) { val stage1Classpath = CbtDependency()(logger).dependencyClasspath logger.stage1("cbt.lib has changed. Recompiling with cp: " ++ stage1Classpath.string) - zinc( true, src, stage2Target, stage1Classpath )( zincVersion = "0.3.9", scalaVersion = constants.scalaVersion ) + zinc( true, src, stage2Target, stage1Classpath, Seq("-deprecation") )( zincVersion = "0.3.9", scalaVersion = constants.scalaVersion ) } logger.stage1(s"[$now] calling CbtDependency.classLoader") diff --git a/stage1/logger.scala b/stage1/logger.scala index 5e8858a..e513443 100644 --- a/stage1/logger.scala +++ b/stage1/logger.scala @@ -29,6 +29,7 @@ case class Logger(enabledLoggers: Set[String]) { final def resolver(msg: => String) = logGuarded(names.resolver, msg) final def lib(msg: => String) = logGuarded(names.lib, msg) final def test(msg: => String) = logGuarded(names.test, msg) + final def git(msg: => String) = logGuarded(names.git, msg) final def pom(msg: => String) = logGuarded(names.pom, msg) private object names{ @@ -41,6 +42,7 @@ case class Logger(enabledLoggers: Set[String]) { val lib = "lib" val test = "test" val pom = "pom" + val git = "git" } private def logGuarded(name: String, msg: => String) = { diff --git a/stage1/resolver.scala b/stage1/resolver.scala index 85eb248..1dbadcc 100644 --- a/stage1/resolver.scala +++ b/stage1/resolver.scala @@ -188,6 +188,7 @@ case class CbtDependency()(implicit val logger: Logger) extends Dependency{ override def dependencies = Seq( Stage1Dependency(), JavaDependency("net.incongru.watchservice","barbary-watchservice","1.0"), + JavaDependency("org.eclipse.jgit", "org.eclipse.jgit", "4.2.0.201601211800-r"), lib.ScalaDependency( "com.lihaoyi","ammonite-ops","0.5.5", scalaVersion = constants.scalaMajorVersion ), @@ -319,7 +320,7 @@ case class JavaDependency( //println("found: "++v.text) v.text match { case Substitution(path) => Option(properties(path)) - //println("lookup "++path ++ ": "++(pomXml\path).text) + //println("lookup "++path ++ ": "++(pomXml\path).text) case value => Option(value) } } |