luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix validatePatterns 

https://github.com/sbt/librarymanagement/pull/312 had a bug.
This commit is contained in:
Eugene Yokota 2019-08-17 22:17:58 -04:00
parent 9e1d4295e7
commit a9873101bf
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala
View File

@ -417,9 +417,15 @@ private[librarymanagement] abstract class ResolverFunctions {
log.warn(s"insecure HTTP request is deprecated '$value'; switch to HTTPS")
}
private[sbt] def validatePatterns(patterns: Patterns): Unit = {
val ivy = patterns.ivyPatterns.headOption map (_.startsWith("http:"))
val art = patterns.artifactPatterns.headOption map (_.startsWith("http:"))
(ivy orElse art) foreach { _ =>
val ivy = patterns.ivyPatterns.headOption match {
case Some(x) => x.startsWith("http:")
case _ => false
}
val art = patterns.artifactPatterns.headOption match {
case Some(x) => x.startsWith("http:")
case _ => false
}
if (ivy || art) {
warnHttp(patterns.toString)
}
}