From 9a666b541851c2bddb49cc4cf517849ec40e8c85 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Fri, 19 Apr 2019 01:07:27 -0400
Subject: [PATCH] use Ivy for some tests

---
 .../sbt-test/actions/external-doc/build.sbt   |  3 +++
 .../classloader-cache/snapshot/build.sbt      |  3 ++-
 .../dependency-management/artifact/build.sbt  |  8 +++++---
 .../cache-classifiers/multi.sbt               |  3 +++
 .../cached-resolution-classifier/multi.sbt    |  2 ++
 .../cached-resolution-exclude/multi.sbt       |  2 ++
 .../circular-dependency/changes/multi.sbt     |  2 ++
 .../configurations-to-retrieve/build.sbt      | 20 +++++++++----------
 .../conflict-manager/build.sbt                |  2 ++
 .../default-artifact/build.sbt                | 16 ++++++++-------
 .../default-artifact/repo/a/b/1.0.0/ivy.xml   |  8 ++++----
 .../ext-pom-classifier/build.sbt              |  2 ++
 .../extra/changes/UseColor.sbt                |  2 ++
 .../force-update-period/build.sbt             |  2 ++
 .../dependency-management/info/build.sbt      |  2 ++
 .../ivy-settings-a/build.sbt                  |  2 ++
 .../ivy-settings-b/build.sbt                  |  2 ++
 .../ivy-settings-c/build.sbt                  |  2 ++
 .../ivy-settings-multi-a/build.sbt            |  2 ++
 .../ivy-settings-multi-b/build.sbt            |  2 ++
 .../changes/use-plugins.sbt                   |  2 ++
 .../pom-classpaths/build.sbt                  |  2 ++
 .../pom-parent-pom/build.sbt                  |  2 ++
 .../retrieve-managed-sync/build.sbt           |  2 ++
 .../scala-organization/build.sbt              |  2 ++
 .../snapshot-resolution/build.sbt             |  3 +++
 .../test-artifact/cache.sbt                   |  4 ++--
 .../dependency-management/url/build.sbt       |  8 +++-----
 sbt/src/sbt-test/project/extra/build.sbt      |  2 ++
 29 files changed, 82 insertions(+), 32 deletions(-)

diff --git a/sbt/src/sbt-test/actions/external-doc/build.sbt b/sbt/src/sbt-test/actions/external-doc/build.sbt
index 80ead271f..834ad7004 100644
--- a/sbt/src/sbt-test/actions/external-doc/build.sbt
+++ b/sbt/src/sbt-test/actions/external-doc/build.sbt
@@ -1,3 +1,6 @@
+// https://github.com/coursier/coursier/issues/1123
+ThisBuild / useCoursier := false
+
 Seq(
 	autoAPIMappings in ThisBuild := true,
 	publishArtifact in (ThisBuild, packageDoc) := false,
diff --git a/sbt/src/sbt-test/classloader-cache/snapshot/build.sbt b/sbt/src/sbt-test/classloader-cache/snapshot/build.sbt
index 73ebc2aa9..a54646805 100644
--- a/sbt/src/sbt-test/classloader-cache/snapshot/build.sbt
+++ b/sbt/src/sbt-test/classloader-cache/snapshot/build.sbt
@@ -1,9 +1,10 @@
 import java.nio.file.Files
 import java.nio.file.attribute.FileTime
-
 import scala.collection.JavaConverters._
 val rewriteIvy = inputKey[Unit]("Rewrite ivy directory")
 
+ThisBuild / useCoursier := false
+
 val snapshot = (project in file(".")).settings(
   name := "akka-test",
   scalaVersion := "2.12.8",
diff --git a/sbt/src/sbt-test/dependency-management/artifact/build.sbt b/sbt/src/sbt-test/dependency-management/artifact/build.sbt
index 5ba1238bf..6e51258c1 100644
--- a/sbt/src/sbt-test/dependency-management/artifact/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/artifact/build.sbt
@@ -3,8 +3,10 @@ import sbt.internal.inc.classpath.ClasspathUtilities
 lazy val checkFull = taskKey[Unit]("")
 lazy val check = taskKey[Unit]("")
 
-lazy val root = (project in file(".")).
-  settings(
+ThisBuild / useCoursier := false
+
+lazy val root = (project in file("."))
+  .settings(
     ivyPaths := IvyPaths(baseDirectory.value, Some(target.value / "ivy-cache")),
     publishTo := Some(Resolver.file("Test Publish Repo", file("test-repo"))),
     resolvers += (baseDirectory { base => "Test Repo" at (base / "test-repo").toURI.toString }).value,
@@ -34,7 +36,7 @@ def publishedID = org % artifactID % vers artifacts(mainArtifact)
 def retrieveID = org % "test-retrieve" % "2.0"
 
 // check that the test class is on the compile classpath, either because it was compiled or because it was properly retrieved
-def checkTask(classpath: TaskKey[Classpath]) = Def task {
+def checkTask(classpath: TaskKey[Classpath]) = Def.task {
   val deps = libraryDependencies.value
   val cp = (classpath in Compile).value.files
   val loader = ClasspathUtilities.toLoader(cp, scalaInstance.value.loader)
diff --git a/sbt/src/sbt-test/dependency-management/cache-classifiers/multi.sbt b/sbt/src/sbt-test/dependency-management/cache-classifiers/multi.sbt
index 75e55de1d..5c155cb2e 100644
--- a/sbt/src/sbt-test/dependency-management/cache-classifiers/multi.sbt
+++ b/sbt/src/sbt-test/dependency-management/cache-classifiers/multi.sbt
@@ -1,5 +1,8 @@
 ThisBuild / scalaVersion := "2.12.8"
 
+// TTL of Coursier is 24h
+ThisBuild / useCoursier := false
+
 def localCache =
 	ivyPaths := IvyPaths(baseDirectory.value, Some((baseDirectory in ThisBuild).value / "ivy" / "cache"))
 
diff --git a/sbt/src/sbt-test/dependency-management/cached-resolution-classifier/multi.sbt b/sbt/src/sbt-test/dependency-management/cached-resolution-classifier/multi.sbt
index 237f70774..e3057754e 100644
--- a/sbt/src/sbt-test/dependency-management/cached-resolution-classifier/multi.sbt
+++ b/sbt/src/sbt-test/dependency-management/cached-resolution-classifier/multi.sbt
@@ -1,3 +1,5 @@
+ThisBuild / useCoursier := false
+
 lazy val check = taskKey[Unit]("Runs the check")
 
 def commonSettings: Seq[Def.Setting[_]] =
diff --git a/sbt/src/sbt-test/dependency-management/cached-resolution-exclude/multi.sbt b/sbt/src/sbt-test/dependency-management/cached-resolution-exclude/multi.sbt
index 7bca9158b..05659cdf1 100644
--- a/sbt/src/sbt-test/dependency-management/cached-resolution-exclude/multi.sbt
+++ b/sbt/src/sbt-test/dependency-management/cached-resolution-exclude/multi.sbt
@@ -1,6 +1,8 @@
 // https://github.com/sbt/sbt/issues/1649
 lazy val check = taskKey[Unit]("Runs the check")
 
+ThisBuild / useCoursier := false
+
 def commonSettings: Seq[Def.Setting[_]] =
   Seq(
     ivyPaths := IvyPaths( (baseDirectory in ThisBuild).value, Some((baseDirectory in LocalRootProject).value / "ivy-cache")),
diff --git a/sbt/src/sbt-test/dependency-management/circular-dependency/changes/multi.sbt b/sbt/src/sbt-test/dependency-management/circular-dependency/changes/multi.sbt
index c86962b24..ce0d2665f 100644
--- a/sbt/src/sbt-test/dependency-management/circular-dependency/changes/multi.sbt
+++ b/sbt/src/sbt-test/dependency-management/circular-dependency/changes/multi.sbt
@@ -1,3 +1,5 @@
+ThisBuild / useCoursier := false
+
 lazy val check = taskKey[Unit]("Runs the check")
 
 def commonSettings: Seq[Def.Setting[_]] =
diff --git a/sbt/src/sbt-test/dependency-management/configurations-to-retrieve/build.sbt b/sbt/src/sbt-test/dependency-management/configurations-to-retrieve/build.sbt
index e8a4aeabd..d03c0f295 100644
--- a/sbt/src/sbt-test/dependency-management/configurations-to-retrieve/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/configurations-to-retrieve/build.sbt
@@ -1,11 +1,11 @@
-configurationsToRetrieve := Some(Vector(Compile))
+ThisBuild / useCoursier := false
 
-retrieveManaged := true
-
-libraryDependencies += "log4j" % "log4j" % "1.2.16" % "compile"
-
-autoScalaLibrary := false
-
-managedDirectory := file("dependencies")
-
-retrievePattern := "[conf]/[artifact]-[revision](-[classifier]).[ext]"
+lazy val root = (project in file("."))
+  .settings(
+    configurationsToRetrieve := Some(Vector(Compile)),
+    retrieveManaged := true,
+    libraryDependencies += "log4j" % "log4j" % "1.2.16" % "compile",
+    autoScalaLibrary := false,
+    managedDirectory := file("dependencies"),
+    retrievePattern := "[conf]/[artifact]-[revision](-[classifier]).[ext]",
+  )
diff --git a/sbt/src/sbt-test/dependency-management/conflict-manager/build.sbt b/sbt/src/sbt-test/dependency-management/conflict-manager/build.sbt
index b5cfdf07b..0dc7a72fc 100644
--- a/sbt/src/sbt-test/dependency-management/conflict-manager/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/conflict-manager/build.sbt
@@ -1,3 +1,5 @@
+ThisBuild / useCoursier := false
+
 libraryDependencies ++= Seq(
 	"org.spark-project" %% "spark-core" % "0.5.1",
 	"log4j" % "log4j" % "1.2.17"
diff --git a/sbt/src/sbt-test/dependency-management/default-artifact/build.sbt b/sbt/src/sbt-test/dependency-management/default-artifact/build.sbt
index 829951e2e..c7fe3b549 100644
--- a/sbt/src/sbt-test/dependency-management/default-artifact/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/default-artifact/build.sbt
@@ -1,11 +1,13 @@
+ThisBuild / useCoursier := false
+
 resolvers += Resolver.file("buggy", file("repo"))(
-	Patterns(
-		ivyPatterns = Vector("[organization]/[module]/[revision]/ivy.xml"),
-		artifactPatterns = Vector("[organization]/[module]/[revision]/[artifact].[ext]"),
-		isMavenCompatible = false,
-		descriptorOptional = true,
-		skipConsistencyCheck = true
-	)
+  Patterns(
+    ivyPatterns = Vector("[organization]/[module]/[revision]/ivy.xml"),
+    artifactPatterns = Vector("[organization]/[module]/[revision]/[artifact].[ext]"),
+    isMavenCompatible = false,
+    descriptorOptional = true,
+    skipConsistencyCheck = true
+  )
 )
 
 libraryDependencies += "a" % "b" % "1.0.0" % "compile->runtime" artifacts(Artifact("b1", "jar", "jar"))
diff --git a/sbt/src/sbt-test/dependency-management/default-artifact/repo/a/b/1.0.0/ivy.xml b/sbt/src/sbt-test/dependency-management/default-artifact/repo/a/b/1.0.0/ivy.xml
index 53fe74fc9..165b4c192 100644
--- a/sbt/src/sbt-test/dependency-management/default-artifact/repo/a/b/1.0.0/ivy.xml
+++ b/sbt/src/sbt-test/dependency-management/default-artifact/repo/a/b/1.0.0/ivy.xml
@@ -1,13 +1,13 @@
 <ivy-module xmlns:e="http://ant.apache.org/ivy/extra" version="2.0">
 <info organisation="a" module="b" revision="1.0.0" status="release" publication="20160201120702">
-	<description>a</description>
+  <description>a</description>
 </info>
 <configurations>
-	<conf name="runtime" description="..."/>
+  <conf name="runtime" description="..."/>
 </configurations>
 <publications>
-	<artifact name="b1.jar" type="jar" ext="jar" conf="runtime"/>
-	<artifact name="b2.jar" type="jar" ext="jar" conf="runtime"/>
+  <artifact name="b1" type="jar" ext="jar" conf="runtime"/>
+  <artifact name="fake" type="jar" ext="jar" conf="runtime"/>
 </publications>
 <dependencies>
 </dependencies>
diff --git a/sbt/src/sbt-test/dependency-management/ext-pom-classifier/build.sbt b/sbt/src/sbt-test/dependency-management/ext-pom-classifier/build.sbt
index cfbfbdb21..d3253a483 100644
--- a/sbt/src/sbt-test/dependency-management/ext-pom-classifier/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/ext-pom-classifier/build.sbt
@@ -1,3 +1,5 @@
+ThisBuild / useCoursier := false
+
 lazy val root = (project in file("."))
   .settings(
     scalaVersion := "2.12.6",
diff --git a/sbt/src/sbt-test/dependency-management/extra/changes/UseColor.sbt b/sbt/src/sbt-test/dependency-management/extra/changes/UseColor.sbt
index fdb138835..2fc37decd 100644
--- a/sbt/src/sbt-test/dependency-management/extra/changes/UseColor.sbt
+++ b/sbt/src/sbt-test/dependency-management/extra/changes/UseColor.sbt
@@ -1,3 +1,5 @@
+ThisBuild / useCoursier := false
+
 lazy val root = (project in file("."))
   .settings(
     organization := "org.example",
diff --git a/sbt/src/sbt-test/dependency-management/force-update-period/build.sbt b/sbt/src/sbt-test/dependency-management/force-update-period/build.sbt
index 1912a7fbb..11bcdf94e 100644
--- a/sbt/src/sbt-test/dependency-management/force-update-period/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/force-update-period/build.sbt
@@ -1,3 +1,5 @@
+ThisBuild / useCoursier := false
+
 libraryDependencies += "log4j" % "log4j" % "1.2.16" % "compile"
 
 autoScalaLibrary := false
diff --git a/sbt/src/sbt-test/dependency-management/info/build.sbt b/sbt/src/sbt-test/dependency-management/info/build.sbt
index 02b4f1447..185711816 100644
--- a/sbt/src/sbt-test/dependency-management/info/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/info/build.sbt
@@ -1,3 +1,5 @@
+ThisBuild / useCoursier := false
+
 import scala.xml._
 
 lazy val root = (project in file(".")).
diff --git a/sbt/src/sbt-test/dependency-management/ivy-settings-a/build.sbt b/sbt/src/sbt-test/dependency-management/ivy-settings-a/build.sbt
index f2e37783d..aabb0862d 100644
--- a/sbt/src/sbt-test/dependency-management/ivy-settings-a/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/ivy-settings-a/build.sbt
@@ -1,3 +1,5 @@
+ThisBuild / useCoursier := false
+
 externalIvySettings()
 externalIvyFile()
 
diff --git a/sbt/src/sbt-test/dependency-management/ivy-settings-b/build.sbt b/sbt/src/sbt-test/dependency-management/ivy-settings-b/build.sbt
index eb3bde0f2..95d2dfa06 100644
--- a/sbt/src/sbt-test/dependency-management/ivy-settings-b/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/ivy-settings-b/build.sbt
@@ -1,3 +1,5 @@
+ThisBuild / useCoursier := false
+
 externalIvySettings()
 
 libraryDependencies += "org.scalacheck" % "scalacheck" % "1.5"
diff --git a/sbt/src/sbt-test/dependency-management/ivy-settings-c/build.sbt b/sbt/src/sbt-test/dependency-management/ivy-settings-c/build.sbt
index c9beeb2f3..2e7cbd392 100644
--- a/sbt/src/sbt-test/dependency-management/ivy-settings-c/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/ivy-settings-c/build.sbt
@@ -1,3 +1,5 @@
+ThisBuild / useCoursier := false
+
 lazy val commonSettings = Seq(
   autoScalaLibrary := false,
   scalaModuleInfo := None,
diff --git a/sbt/src/sbt-test/dependency-management/ivy-settings-multi-a/build.sbt b/sbt/src/sbt-test/dependency-management/ivy-settings-multi-a/build.sbt
index d218debd4..12b354173 100644
--- a/sbt/src/sbt-test/dependency-management/ivy-settings-multi-a/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/ivy-settings-multi-a/build.sbt
@@ -1,3 +1,5 @@
+ThisBuild / useCoursier := false
+
 lazy val commonSettings = Seq(
   autoScalaLibrary := false,
   unmanagedJars in Compile ++= (scalaInstance map (_.allJars.toSeq)).value
diff --git a/sbt/src/sbt-test/dependency-management/ivy-settings-multi-b/build.sbt b/sbt/src/sbt-test/dependency-management/ivy-settings-multi-b/build.sbt
index 0718f9071..94a522095 100644
--- a/sbt/src/sbt-test/dependency-management/ivy-settings-multi-b/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/ivy-settings-multi-b/build.sbt
@@ -1,3 +1,5 @@
+ThisBuild / useCoursier := false
+
 lazy val a = (project in file(".")).
   settings(externalIvySettings()) dependsOn(b)
 
diff --git a/sbt/src/sbt-test/dependency-management/latest-local-plugin/changes/use-plugins.sbt b/sbt/src/sbt-test/dependency-management/latest-local-plugin/changes/use-plugins.sbt
index 777b3f0ae..175234505 100644
--- a/sbt/src/sbt-test/dependency-management/latest-local-plugin/changes/use-plugins.sbt
+++ b/sbt/src/sbt-test/dependency-management/latest-local-plugin/changes/use-plugins.sbt
@@ -1,3 +1,5 @@
+ThisBuild / useCoursier := false
+
 addSbtPlugin("org.example" % "def" % "latest.integration")
 
 resolvers ++= {
diff --git a/sbt/src/sbt-test/dependency-management/pom-classpaths/build.sbt b/sbt/src/sbt-test/dependency-management/pom-classpaths/build.sbt
index 2cef1bd25..8e57b688a 100644
--- a/sbt/src/sbt-test/dependency-management/pom-classpaths/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/pom-classpaths/build.sbt
@@ -1,3 +1,5 @@
+ThisBuild / useCoursier := false
+
 import complete._
 import complete.DefaultParsers._
 
diff --git a/sbt/src/sbt-test/dependency-management/pom-parent-pom/build.sbt b/sbt/src/sbt-test/dependency-management/pom-parent-pom/build.sbt
index 458581d12..fa8e4369f 100644
--- a/sbt/src/sbt-test/dependency-management/pom-parent-pom/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/pom-parent-pom/build.sbt
@@ -1,3 +1,5 @@
+ThisBuild / useCoursier := false
+
 val checkIvyXml = taskKey[Unit]("Checks the ivy.xml transform was correct")
 
 lazy val root = (project in file(".")).
diff --git a/sbt/src/sbt-test/dependency-management/retrieve-managed-sync/build.sbt b/sbt/src/sbt-test/dependency-management/retrieve-managed-sync/build.sbt
index 4568f6663..980fcc3cd 100644
--- a/sbt/src/sbt-test/dependency-management/retrieve-managed-sync/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/retrieve-managed-sync/build.sbt
@@ -1,3 +1,5 @@
+ThisBuild / useCoursier := false
+
 retrieveManaged := true
 
 libraryDependencies += "log4j" % "log4j" % "1.2.16"
diff --git a/sbt/src/sbt-test/dependency-management/scala-organization/build.sbt b/sbt/src/sbt-test/dependency-management/scala-organization/build.sbt
index 82a7dce27..42d335c4d 100644
--- a/sbt/src/sbt-test/dependency-management/scala-organization/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/scala-organization/build.sbt
@@ -1,3 +1,5 @@
+ThisBuild / useCoursier := false
+
 organization := "org.dummy"
 
 scalaOrganization := "org.other"
diff --git a/sbt/src/sbt-test/dependency-management/snapshot-resolution/build.sbt b/sbt/src/sbt-test/dependency-management/snapshot-resolution/build.sbt
index b7d912223..be1d08d66 100644
--- a/sbt/src/sbt-test/dependency-management/snapshot-resolution/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/snapshot-resolution/build.sbt
@@ -1,6 +1,9 @@
 ThisBuild / organization := "com.example"
 ThisBuild / scalaVersion := "2.12.8"
 
+// TTL is 24h so we can't detect the change
+ThisBuild / useCoursier := false
+
 def customIvyPaths: Seq[Def.Setting[_]] = Seq(
   ivyPaths := IvyPaths((baseDirectory in ThisBuild).value, Some((baseDirectory in ThisBuild).value / "ivy-cache"))
 )
diff --git a/sbt/src/sbt-test/dependency-management/test-artifact/cache.sbt b/sbt/src/sbt-test/dependency-management/test-artifact/cache.sbt
index 54bded6d5..f6fe7926d 100644
--- a/sbt/src/sbt-test/dependency-management/test-artifact/cache.sbt
+++ b/sbt/src/sbt-test/dependency-management/test-artifact/cache.sbt
@@ -1,10 +1,10 @@
+ThisBuild / useCoursier := false
+
 ivyPaths := {
 	val base = baseDirectory.value
 	IvyPaths(base, Some(base / "ivy-cache"))
 }
 
 managedScalaInstance := false
-
 autoScalaLibrary := false
-
 crossPaths := false
diff --git a/sbt/src/sbt-test/dependency-management/url/build.sbt b/sbt/src/sbt-test/dependency-management/url/build.sbt
index 4e384ca23..f3b8f6fa2 100644
--- a/sbt/src/sbt-test/dependency-management/url/build.sbt
+++ b/sbt/src/sbt-test/dependency-management/url/build.sbt
@@ -11,14 +11,12 @@ lazy val root = (project in file(".")).
 
 def checkClasspath(conf: Configuration) =
   fullClasspath in conf map { cp =>
-    try
-    {
+    try {
       val loader = ClasspathUtilities.toLoader(cp.files)
       Class.forName("org.jsoup.Jsoup", false, loader)
       ()
     }
-    catch
-    {
-      case _: ClassNotFoundException => sys.error("Dependency not downloaded.")
+    catch {
+      case _: ClassNotFoundException => sys.error(s"could not instantiate org.jsoup.Jsoup: ${cp.files}")
     }
   }
diff --git a/sbt/src/sbt-test/project/extra/build.sbt b/sbt/src/sbt-test/project/extra/build.sbt
index 113584958..556d3e61b 100644
--- a/sbt/src/sbt-test/project/extra/build.sbt
+++ b/sbt/src/sbt-test/project/extra/build.sbt
@@ -1,3 +1,5 @@
+ThisBuild / useCoursier := false
+
 lazy val root = (project in file(".")).
   settings(
     autoScalaLibrary := false,