From 68505aad4a22686594965bc910e60c8d2b6a95d4 Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Sun, 19 May 2019 15:15:24 +0800
Subject: Bump ammonite to 1.6.7 (#610)

* bump ammonite to 1.6.7

* upgrade all the things

* add scalaj-http shims for bootstrapping

* wip

* tweak-error-message

* tweak coursier

* .
---
 scalalib/test/src/GenIdeaTests.scala                         |  3 +--
 scalalib/test/src/ResolveDepsTests.scala                     |  3 +--
 .../src/dependency/metadata/MetadataLoaderFactoryTests.scala | 12 ++++++++----
 .../test/src/dependency/updates/UpdatesFinderTests.scala     |  5 ++++-
 4 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'scalalib/test/src')

diff --git a/scalalib/test/src/GenIdeaTests.scala b/scalalib/test/src/GenIdeaTests.scala
index f8d9a0ed..60c9f9a8 100644
--- a/scalalib/test/src/GenIdeaTests.scala
+++ b/scalalib/test/src/GenIdeaTests.scala
@@ -1,6 +1,5 @@
 package mill.scalalib
 
-import coursier.Cache
 import mill._
 import mill.util.{TestEvaluator, TestUtil}
 import utest._
@@ -57,6 +56,6 @@ object GenIdeaTests extends TestSuite {
 
 
   private def normaliseLibraryPaths(in: String): String = {
-    in.replaceAll(Cache.default.toPath.toAbsolutePath.toString, "COURSIER_HOME")
+    in.replaceAll(coursier.paths.CoursierPaths.cacheDirectory().toString, "COURSIER_HOME")
   }
 }
diff --git a/scalalib/test/src/ResolveDepsTests.scala b/scalalib/test/src/ResolveDepsTests.scala
index ce905907..94b8adb9 100644
--- a/scalalib/test/src/ResolveDepsTests.scala
+++ b/scalalib/test/src/ResolveDepsTests.scala
@@ -1,6 +1,5 @@
 package mill.scalalib
 
-import coursier.Cache
 import coursier.maven.MavenRepository
 import mill.api.Result.{Failure, Success}
 import mill.eval.{PathRef, Result}
@@ -8,7 +7,7 @@ import mill.api.Loose.Agg
 import utest._
 
 object ResolveDepsTests extends TestSuite {
-  val repos = Seq(Cache.ivy2Local, MavenRepository("https://repo1.maven.org/maven2"))
+  val repos = Seq(coursier.LocalRepositories.ivy2Local, MavenRepository("https://repo1.maven.org/maven2"))
 
   def evalDeps(deps: Agg[Dep]): Result[Agg[PathRef]] = Lib.resolveDependencies(
     repos,
diff --git a/scalalib/test/src/dependency/metadata/MetadataLoaderFactoryTests.scala b/scalalib/test/src/dependency/metadata/MetadataLoaderFactoryTests.scala
index 4c2206b8..af2ea617 100644
--- a/scalalib/test/src/dependency/metadata/MetadataLoaderFactoryTests.scala
+++ b/scalalib/test/src/dependency/metadata/MetadataLoaderFactoryTests.scala
@@ -28,8 +28,8 @@
  */
 package mill.scalalib.dependency.metadata
 
-import coursier.Fetch.Content
-import coursier.core.{Artifact, Module, Project, Repository}
+import coursier.Fetch
+import coursier.core.{Artifact, Classifier, Dependency, Module, Project, Repository}
 import coursier.ivy.IvyRepository
 import coursier.maven.MavenRepository
 import coursier.util.{EitherT, Monad}
@@ -57,8 +57,12 @@ object MetadataLoaderFactoryTests extends TestSuite {
   }
 
   case class CustomRepository() extends Repository {
-    override def find[F[_]](module: Module, version: String, fetch: Content[F])(
-        implicit F: Monad[F]): EitherT[F, String, (Artifact.Source, Project)] =
+    override def find[F[_]](module: Module, version: String, fetch: coursier.Repository.Fetch[F])
+                           (implicit F: Monad[F]): EitherT[F, String, (Artifact.Source, Project)] =
       ???
+
+    override def artifacts(dependency: Dependency,
+                           project: Project,
+                           overrideClassifiers: Option[Seq[Classifier]]) = ???
   }
 }
diff --git a/scalalib/test/src/dependency/updates/UpdatesFinderTests.scala b/scalalib/test/src/dependency/updates/UpdatesFinderTests.scala
index 7b6e6e36..3b613bcb 100644
--- a/scalalib/test/src/dependency/updates/UpdatesFinderTests.scala
+++ b/scalalib/test/src/dependency/updates/UpdatesFinderTests.scala
@@ -37,7 +37,10 @@ object UpdatesFinderTests extends TestSuite {
                       available: Seq[String],
                       allowPreRelease: Boolean) = {
     val dependency = coursier.Dependency(
-      coursier.Module("com.example.organization", "example-artifact"),
+      coursier.Module(
+        coursier.Organization("com.example.organization"),
+        coursier.ModuleName("example-artifact")
+      ),
       current)
     val currentVersion = Version(current)
     val allVersions = available.map(Version(_)).toSet
-- 
cgit v1.2.3