diff options
-rw-r--r-- | stage1/Stage1Lib.scala | 8 | ||||
-rw-r--r-- | stage1/resolver.scala | 8 | ||||
-rw-r--r-- | stage2/BasicBuild.scala | 4 |
3 files changed, 10 insertions, 10 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 ) diff --git a/stage2/BasicBuild.scala b/stage2/BasicBuild.scala index 0a338b9..f102d5c 100644 --- a/stage2/BasicBuild.scala +++ b/stage2/BasicBuild.scala @@ -119,8 +119,8 @@ trait BaseBuild extends BuildInterface with DependencyImplementation with Trigge def ScalaDependency( groupId: String, artifactId: String, version: String, classifier: Classifier = Classifier.none, - scalaVersion: String = scalaMajorVersion - ) = lib.ScalaDependency( groupId, artifactId, version, classifier, scalaVersion ) + scalaVersion: String = scalaMajorVersion, verifyHash: Boolean = true + ) = lib.ScalaDependency( groupId, artifactId, version, classifier, scalaVersion, verifyHash ) final def DirectoryDependency(path: File, pathToNestedBuild: String*) = cbt.DirectoryDependency( context.copy( workingDirectory = path ), |