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

* .
---
 contrib/bloop/src/mill.contrib.bloop/BloopImpl.scala | 19 +++++++++++--------
 contrib/playlib/src/mill/playlib/RouterModule.scala  |  4 ++--
 contrib/scalapblib/src/ScalaPBModule.scala           |  4 ++--
 contrib/twirllib/src/TwirlModule.scala               |  4 ++--
 4 files changed, 17 insertions(+), 14 deletions(-)

(limited to 'contrib')

diff --git a/contrib/bloop/src/mill.contrib.bloop/BloopImpl.scala b/contrib/bloop/src/mill.contrib.bloop/BloopImpl.scala
index e99b25d5..03af2465 100644
--- a/contrib/bloop/src/mill.contrib.bloop/BloopImpl.scala
+++ b/contrib/bloop/src/mill.contrib.bloop/BloopImpl.scala
@@ -238,19 +238,22 @@ class BloopImpl(ev: () => Evaluator, wd: Path) extends ExternalModule { outer =>
       import coursier.util._
 
       def source(r: Resolution) = Resolution(
-        r.dependencies.map(d =>
-          d.copy(attributes = d.attributes.copy(classifier = "sources")))
+        r.dependencies
+          .map(d =>
+            d.copy(attributes = d.attributes.copy(classifier = coursier.Classifier("sources")))
+          )
+          .toSeq
       )
 
       import scala.concurrent.ExecutionContext.Implicits.global
-      val unresolved = Resolution(deps.toSet)
-      val fetch = Fetch.from(repos, Cache.fetch[Task]())
+      val unresolved = Resolution(deps)
+      val fetch = ResolutionProcess.fetch(repos, coursier.cache.Cache.default.fetch)
       val gatherTask = for {
         resolved <- unresolved.process.run(fetch)
         resolvedSources <- source(resolved).process.run(fetch)
         all = resolved.dependencyArtifacts ++ resolvedSources.dependencyArtifacts
         gathered <- Gather[Task].gather(all.distinct.map {
-          case (dep, art) => Cache.file[Task](art).run.map(dep -> _)
+          case (dep, art) => coursier.cache.Cache.default.file(art).run.map(dep -> _)
         })
       } yield
         gathered
@@ -268,14 +271,14 @@ class BloopImpl(ev: () => Evaluator, wd: Path) extends ExternalModule { outer =>
           .mapValues {
             _.map {
               case (_, mod, _, classifier, file) =>
-                BloopConfig.Artifact(mod, classifier, None, file.toPath)
+                BloopConfig.Artifact(mod.value, classifier.map(_.value), None, file.toPath)
             }.toList
           }
           .map {
             case ((org, mod, version), artifacts) =>
               BloopConfig.Module(
-                organization = org,
-                name = mod,
+                organization = org.value,
+                name = mod.value,
                 version = version,
                 configurations = None,
                 artifacts = artifacts
diff --git a/contrib/playlib/src/mill/playlib/RouterModule.scala b/contrib/playlib/src/mill/playlib/RouterModule.scala
index abf3082b..5af87839 100644
--- a/contrib/playlib/src/mill/playlib/RouterModule.scala
+++ b/contrib/playlib/src/mill/playlib/RouterModule.scala
@@ -1,7 +1,7 @@
 package mill
 package playlib
 
-import coursier.{Cache, MavenRepository}
+import coursier.MavenRepository
 import mill.eval.PathRef
 import mill.playlib.api.RouteCompilerType
 import mill.scalalib.Lib.resolveDependencies
@@ -49,7 +49,7 @@ trait RouterModule extends ScalaModule with Version {
   def routerClasspath: T[Agg[PathRef]] = T {
     resolveDependencies(
       Seq(
-        Cache.ivy2Local,
+        coursier.LocalRepositories.ivy2Local,
         MavenRepository("https://repo1.maven.org/maven2")
       ),
       Lib.depToDependency(_, scalaVersion()),
diff --git a/contrib/scalapblib/src/ScalaPBModule.scala b/contrib/scalapblib/src/ScalaPBModule.scala
index 57bfdd40..00b977ce 100644
--- a/contrib/scalapblib/src/ScalaPBModule.scala
+++ b/contrib/scalapblib/src/ScalaPBModule.scala
@@ -1,7 +1,7 @@
 package mill
 package contrib.scalapblib
 
-import coursier.{Cache, MavenRepository}
+import coursier.MavenRepository
 import coursier.core.Version
 import mill.define.Sources
 import mill.api.PathRef
@@ -51,7 +51,7 @@ trait ScalaPBModule extends ScalaModule {
   def scalaPBClasspath: T[Loose.Agg[PathRef]] = T {
     resolveDependencies(
       Seq(
-        Cache.ivy2Local,
+        coursier.LocalRepositories.ivy2Local,
         MavenRepository("https://repo1.maven.org/maven2")
       ),
       Lib.depToDependency(_, "2.12.4"),
diff --git a/contrib/twirllib/src/TwirlModule.scala b/contrib/twirllib/src/TwirlModule.scala
index 22e4a43a..72887019 100644
--- a/contrib/twirllib/src/TwirlModule.scala
+++ b/contrib/twirllib/src/TwirlModule.scala
@@ -1,7 +1,7 @@
 package mill
 package twirllib
 
-import coursier.{Cache, MavenRepository}
+import coursier.MavenRepository
 import mill.define.Sources
 import mill.api.PathRef
 import mill.scalalib.Lib.resolveDependencies
@@ -22,7 +22,7 @@ trait TwirlModule extends mill.Module {
   def twirlClasspath: T[Loose.Agg[PathRef]] = T {
     resolveDependencies(
       Seq(
-        Cache.ivy2Local,
+        coursier.LocalRepositories.ivy2Local,
         MavenRepository("https://repo1.maven.org/maven2")
       ),
       Lib.depToDependency(_, "2.12.4"),
-- 
cgit v1.2.3