From a9873101bf4290c48de3e8008545ada22155b9f1 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Sat, 17 Aug 2019 22:17:58 -0400
Subject: [PATCH] Fix validatePatterns

https://github.com/sbt/librarymanagement/pull/312 had a bug.
---
 .../scala/sbt/librarymanagement/ResolverExtra.scala  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala b/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala
index d1d435014..835445ec1 100644
--- a/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala
+++ b/core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala
@@ -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)
     }
   }