diff options
| author | Christopher Vogt <oss.nsp@cvogt.org> | 2017-03-06 20:07:12 -0500 |
|---|---|---|
| committer | Christopher Vogt <oss.nsp@cvogt.org> | 2017-03-06 20:07:12 -0500 |
| commit | 78b22ae86df111b89db1ecb20c40a0384b148698 (patch) | |
| tree | 7488e04d51efa0649162db75f6da6a78ed5a1559 /stage1 | |
| parent | 2f7710bf1c34ad8b3720d976e2687fe9b2c8ad83 (diff) | |
| download | cbt-78b22ae86df111b89db1ecb20c40a0384b148698.tar.gz cbt-78b22ae86df111b89db1ecb20c40a0384b148698.tar.bz2 cbt-78b22ae86df111b89db1ecb20c40a0384b148698.zip | |
support resolving unsigned dependencies
Diffstat (limited to 'stage1')
| -rw-r--r-- | stage1/Stage1Lib.scala | 8 | ||||
| -rw-r--r-- | stage1/resolver.scala | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/stage1/Stage1Lib.scala b/stage1/Stage1Lib.scala index f2f468c..87d3a79 100644 --- a/stage1/Stage1Lib.scala +++ b/stage1/Stage1Lib.scala @@ -226,7 +226,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 @@ -237,7 +237,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 @@ -358,10 +358,10 @@ ${sourceFiles.sorted.mkString(" \\\n")} def ScalaDependency( groupId: String, artifactId: String, version: String, classifier: Classifier = Classifier.none, - scalaMajorVersion: String + scalaMajorVersion: String, verifyHash: Boolean = true ) = MavenDependency( - groupId, artifactId ++ "_" ++ scalaMajorVersion, version, classifier + groupId, artifactId ++ "_" ++ scalaMajorVersion, version, classifier, verifyHash ) def cacheOnDisk[T] diff --git a/stage1/resolver.scala b/stage1/resolver.scala index ab3196a..6e7ec09 100644 --- a/stage1/resolver.scala +++ b/stage1/resolver.scala @@ -210,7 +210,7 @@ abstract class DependenciesProxy{ } case class MavenDependency( - groupId: String, artifactId: String, version: String, classifier: Classifier = Classifier.none + groupId: String, artifactId: String, version: String, classifier: Classifier = Classifier.none, verifyHash: Boolean = true ){ private[cbt] def serialize = groupId ++ ":" ++ artifactId ++ ":"++ version ++ classifier.name.map(":" ++ _).getOrElse("") } @@ -231,7 +231,7 @@ case class BoundMavenDependency( case o: BoundMavenDependency => o.mavenDependency == mavenDependency && o.repositories == repositories case _ => false } - val MavenDependency( groupId, artifactId, version, classifier ) = mavenDependency + val MavenDependency( groupId, artifactId, version, classifier, verifyHash ) = mavenDependency assert( Option(groupId).collect{ case BoundMavenDependency.ValidIdentifier(_) => @@ -283,8 +283,8 @@ case class BoundMavenDependency( def jarSha1: String = taskCache[BoundMavenDependency]("jarSha1").memoize{ resolveHash("jar", true) } def pomSha1: String = taskCache[BoundMavenDependency]("pomSha1").memoize{ resolveHash("pom", false) } - def jar: File = taskCache[BoundMavenDependency]("jar").memoize{ resolve("jar", Some(jarSha1), true) } - def pom: File = taskCache[BoundMavenDependency]("pom").memoize{ resolve("pom", Some(pomSha1), false) } + def jar: File = taskCache[BoundMavenDependency]("jar").memoize{ resolve("jar", if(verifyHash) Some(jarSha1) else None, true) } + def pom: File = taskCache[BoundMavenDependency]("pom").memoize{ resolve("pom", if(verifyHash) Some(pomSha1) else None, false) } private def pomXml = { logger.resolver( "Loading pom file: " ++ pom.string ) |