diff options
| author | Christopher Vogt <oss.nsp@cvogt.org> | 2016-03-12 20:16:09 -0500 |
|---|---|---|
| committer | Christopher Vogt <oss.nsp@cvogt.org> | 2016-03-12 20:32:00 -0500 |
| commit | 5cab4822929157f97bf92659abb1b892748493d1 (patch) | |
| tree | 1e759e6a8b31be9b1a33cf1ade16bb00f3d3a74d | |
| parent | 3777d17027dfb99454d210702551866f2b570830 (diff) | |
| download | cbt-5cab4822929157f97bf92659abb1b892748493d1.tar.gz cbt-5cab4822929157f97bf92659abb1b892748493d1.tar.bz2 cbt-5cab4822929157f97bf92659abb1b892748493d1.zip | |
fix zinc interface dependencies
| -rw-r--r-- | stage1/Stage1Lib.scala | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/stage1/Stage1Lib.scala b/stage1/Stage1Lib.scala index c9cd5c9..b76e21b 100644 --- a/stage1/Stage1Lib.scala +++ b/stage1/Stage1Lib.scala @@ -124,17 +124,6 @@ class Stage1Lib( val logger: Logger ) extends BaseLib{ } } - private def getZincDependencyJar(zincDeps: Seq[Dependency], zincVersion: String, group: String, name: String) = { - zincDeps - .collect { - case dependency @ JavaDependency( group, name, _, _ ) => - dependency - } - .headOption - .getOrElse( throw new Exception(s"cannot find $name in zinc $zincVersion dependencies: " ++ zincDeps.toString) ) - .jar - } - def zinc( needsRecompile: Boolean, files: Seq[File], @@ -156,8 +145,19 @@ class Stage1Lib( val logger: Logger ) extends BaseLib{ val zinc = JavaDependency("com.typesafe.zinc","zinc", zincVersion) val zincDeps = zinc.transitiveDependencies - val sbtInterface = getZincDependencyJar(zincDeps, zincVersion, "com.typesafe.sbt", "sbt-interface") - val compilerInterface = getZincDependencyJar(zincDeps, zincVersion, "com.typesafe.sbt", "compiler-interface") + val sbtInterface = + zincDeps + .collect{ case d @ JavaDependency( "com.typesafe.sbt", "sbt-interface", _, Classifier.none ) => d } + .headOption + .getOrElse( throw new Exception(s"cannot find sbt-interface in zinc $zincVersion dependencies: "++zincDeps.toString) ) + .jar + + val compilerInterface = + zincDeps + .collect{ case d @ JavaDependency( "com.typesafe.sbt", "compiler-interface", _, Classifier.sources ) => d } + .headOption + .getOrElse( throw new Exception(s"cannot find compiler-interface in zinc $zincVersion dependencies: "++zincDeps.toString) ) + .jar val scalaLibrary = JavaDependency("org.scala-lang","scala-library",scalaVersion).jar val scalaReflect = JavaDependency("org.scala-lang","scala-reflect",scalaVersion).jar |