aboutsummaryrefslogtreecommitdiff
path: root/stage1/Stage1Lib.scala
diff options
context:
space:
mode:
authorChristopher Vogt <oss.nsp@cvogt.org>2017-03-17 03:09:07 -0400
committerChristopher Vogt <oss.nsp@cvogt.org>2017-03-17 03:09:07 -0400
commitebf93c0807053bf2408456e893e5e26afd805f0e (patch)
tree8018dfd7c5dbaf848cf6d5ac9a33688f527b8526 /stage1/Stage1Lib.scala
parentb9c20082bcbd231eb67c3ded0d3fe6674c8c55b7 (diff)
downloadcbt-ebf93c0807053bf2408456e893e5e26afd805f0e.tar.gz
cbt-ebf93c0807053bf2408456e893e5e26afd805f0e.tar.bz2
cbt-ebf93c0807053bf2408456e893e5e26afd805f0e.zip
Replace dependencies feature for conflict resolution
Diffstat (limited to 'stage1/Stage1Lib.scala')
-rw-r--r--stage1/Stage1Lib.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/stage1/Stage1Lib.scala b/stage1/Stage1Lib.scala
index 1cda9fd..83febe8 100644
--- a/stage1/Stage1Lib.scala
+++ b/stage1/Stage1Lib.scala
@@ -239,7 +239,7 @@ class Stage1Lib( logger: Logger ) extends BaseLib{
zincDeps
.collect{ case d @
BoundMavenDependency(
- _, _, MavenDependency( "com.typesafe.sbt", "sbt-interface", _, Classifier.none, _), _
+ _, _, MavenDependency( "com.typesafe.sbt", "sbt-interface", _, Classifier.none, _), _, _
) => d
}
.headOption
@@ -250,7 +250,7 @@ class Stage1Lib( logger: Logger ) extends BaseLib{
zincDeps
.collect{ case d @
BoundMavenDependency(
- _, _, MavenDependency( "com.typesafe.sbt", "compiler-interface", _, Classifier.sources, _), _
+ _, _, MavenDependency( "com.typesafe.sbt", "compiler-interface", _, Classifier.sources, _), _, _
) => d
}
.headOption