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 1/2] 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)
     }
   }

From cc6147c8d2f8523e86e45f503c1fbdad982c0c1d Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Sat, 17 Aug 2019 23:06:52 -0400
Subject: [PATCH 2/2] Remove lmCommonTest

---
 build.sbt                                     | 24 +++++++------------
 .../AbstractEngineSpec.scala                  |  0
 .../librarymanagement/ResolutionSpec.scala    |  0
 3 files changed, 9 insertions(+), 15 deletions(-)
 rename {common-test/src/main => ivy/src/test}/scala/sbt/internal/librarymanagement/AbstractEngineSpec.scala (100%)
 rename {common-test/src/main => ivy/src/test}/scala/sbt/internal/librarymanagement/ResolutionSpec.scala (100%)

diff --git a/build.sbt b/build.sbt
index 923df2598..1c06bbb25 100644
--- a/build.sbt
+++ b/build.sbt
@@ -98,6 +98,7 @@ lazy val lmCore = (project in file("core"))
       sjsonnewScalaJson.value % Optional,
       scalaTest % Test,
       scalaCheck % Test,
+      scalaVerify % Test,
     ),
     libraryDependencies += scalaXml,
     resourceGenerators in Compile += Def
@@ -217,25 +218,18 @@ lazy val lmCore = (project in file("core"))
   )
   .configure(addSbtIO, addSbtUtilLogging, addSbtUtilPosition, addSbtUtilCache)
 
-lazy val lmCommonTest = (project in file("common-test"))
+lazy val lmIvy = (project in file("ivy"))
+  .enablePlugins(ContrabandPlugin, JsonCodecPlugin)
   .dependsOn(lmCore)
-  .settings(
-    commonSettings,
-    skip in publish := true,
-    name := "common-test",
-    libraryDependencies ++= Seq(scalaTest, scalaCheck, scalaVerify),
-    scalacOptions in (Compile, console) --=
-      Vector("-Ywarn-unused-import", "-Ywarn-unused", "-Xlint"),
-    mimaSettings,
-  )
-
-lazy val lmIvy = (project in file("ivy"))
-  .enablePlugins(ContrabandPlugin, JsonCodecPlugin)
-  .dependsOn(lmCore, lmCommonTest % Test)
   .settings(
     commonSettings,
     name := "librarymanagement-ivy",
-    libraryDependencies ++= Seq(ivy),
+    libraryDependencies ++= Seq(
+      ivy,
+      scalaTest % Test,
+      scalaCheck % Test,
+      scalaVerify % Test,
+    ),
     managedSourceDirectories in Compile +=
       baseDirectory.value / "src" / "main" / "contraband-scala",
     sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala",
diff --git a/common-test/src/main/scala/sbt/internal/librarymanagement/AbstractEngineSpec.scala b/ivy/src/test/scala/sbt/internal/librarymanagement/AbstractEngineSpec.scala
similarity index 100%
rename from common-test/src/main/scala/sbt/internal/librarymanagement/AbstractEngineSpec.scala
rename to ivy/src/test/scala/sbt/internal/librarymanagement/AbstractEngineSpec.scala
diff --git a/common-test/src/main/scala/sbt/internal/librarymanagement/ResolutionSpec.scala b/ivy/src/test/scala/sbt/internal/librarymanagement/ResolutionSpec.scala
similarity index 100%
rename from common-test/src/main/scala/sbt/internal/librarymanagement/ResolutionSpec.scala
rename to ivy/src/test/scala/sbt/internal/librarymanagement/ResolutionSpec.scala