Merge pull request #31 from coursier/topic/coursier-1.1.0-M10

Switch to coursier 1.1.0-M10

.travis.yml

@@ -20,6 +20,10 @@ jobs:
     - env: LM_COURSIER=1 TEST_GROUP=2
     - stage: release
       script: sbt ci-release
+branches:
+  only:
+  - master
+  - /^v\d+\.\d+.*$/ # tagged versions
 cache:
   directories:
   - $HOME/.ivy2/cache

build.sbt

@@ -15,7 +15,7 @@ inThisBuild(List(
   )
 ))
 
-val coursierVersion = "1.1.0-M9"
+val coursierVersion = "1.1.0-M10"
 
 lazy val `lm-coursier` = project
   .in(file("modules/lm-coursier"))

modules/lm-coursier/src/main/scala/coursier/lmcoursier/ArtifactsParams.scala

@@ -2,6 +2,7 @@ package coursier.lmcoursier
 
 import java.io.File
 
+import coursier.cache.CacheLogger
 import coursier.{Cache, CachePolicy}
 import coursier.core.{Classifier, Resolution}
 
@@ -12,7 +13,7 @@ final case class ArtifactsParams(
   res: Seq[Resolution],
   includeSignatures: Boolean,
   parallelDownloads: Int,
-  createLogger: () => Cache.Logger,
+  createLogger: () => CacheLogger,
   cache: File,
   artifactsChecksums: Seq[Option[String]],
   ttl: Option[Duration],

modules/lm-coursier/src/main/scala/coursier/lmcoursier/ArtifactsRun.scala

@@ -3,6 +3,7 @@ package coursier.lmcoursier
 import java.io.File
 import java.util.concurrent.ExecutorService
 
+import coursier.cache.CacheLogger
 import coursier.{Artifact, Cache, CachePolicy, FileError}
 import coursier.util.{Schedulable, Task}
 import sbt.util.Logger
@@ -33,7 +34,7 @@ object ArtifactsRun {
     Lock.lock.synchronized {
 
       var pool: ExecutorService = null
-      var artifactsLogger: Cache.Logger = null
+      var artifactsLogger: CacheLogger = null
 
       val printOptionalMessage = verbosityLevel >= 0 && verbosityLevel <= 1
 

modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierDependencyResolution.scala

@@ -7,6 +7,7 @@ import _root_.coursier.core.{Classifier, Configuration, ModuleName}
 import _root_.coursier.extra.Typelevel
 import _root_.coursier.ivy.IvyRepository
 import _root_.coursier.lmcoursier.Inputs.withAuthenticationByHost
+import coursier.cache.CacheDefaults
 import sbt.internal.librarymanagement.IvySbt
 import sbt.librarymanagement._
 import sbt.util.Logger
@@ -74,13 +75,13 @@ class CoursierDependencyResolution(conf: CoursierConfiguration) extends Dependen
 
     val verbosityLevel = 0
 
-    val ttl = Cache.defaultTtl
+    val ttl = CacheDefaults.ttl
     val createLogger = conf.createLogger.map(_.create).getOrElse { () =>
       new TermDisplay(new OutputStreamWriter(System.err), fallbackMode = true)
     }
-    val cache = conf.cache.getOrElse(Cache.default)
+    val cache = conf.cache.getOrElse(CacheDefaults.location)
     val cachePolicies = CachePolicy.default
-    val checksums = Cache.defaultChecksums
+    val checksums = CacheDefaults.checksums
     val projectName = "" // used for logging only…
 
     val ivyProperties = ResolutionParams.defaultIvyProperties()

modules/lm-coursier/src/main/scala/coursier/lmcoursier/CreateLogger.scala

@@ -1,3 +1,5 @@
 package coursier.lmcoursier
 
-final case class CreateLogger(create: () => coursier.Cache.Logger)
+import coursier.cache.CacheLogger
+
+final case class CreateLogger(create: () => CacheLogger)

modules/lm-coursier/src/main/scala/coursier/lmcoursier/FromSbt.scala

@@ -4,6 +4,7 @@ import coursier.ivy.IvyRepository
 import coursier.ivy.IvyXml.{mappings => ivyXmlMappings}
 import java.net.{MalformedURLException, URL}
 
+import coursier.cache.CacheUrl
 import coursier.{Attributes, Cache, Dependency, Module}
 import coursier.core._
 import coursier.maven.MavenRepository
@@ -183,7 +184,7 @@ object FromSbt {
     authentication: Option[Authentication]
   ): Option[MavenRepository] =
     try {
-      Cache.url(root) // ensure root is a URL whose protocol can be handled here
+      CacheUrl.url(root) // ensure root is a URL whose protocol can be handled here
       val root0 = if (root.endsWith("/")) root else root + "/"
       Some(
         MavenRepository(

modules/lm-coursier/src/main/scala/coursier/lmcoursier/Inputs.scala

@@ -1,6 +1,6 @@
 package coursier.lmcoursier
 
-import coursier.Cache
+import coursier.cache.CacheUrl
 import coursier.core._
 import coursier.ivy.IvyRepository
 import coursier.maven.MavenRepository
@@ -154,7 +154,7 @@ object Inputs {
 
     def httpHost(s: String) =
       if (s.startsWith("http://") || s.startsWith("https://"))
-        Try(Cache.url(s).getHost).toOption
+        Try(CacheUrl.url(s).getHost).toOption
       else
         None
 

modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionParams.scala

@@ -3,6 +3,7 @@ package coursier.lmcoursier
 import java.io.File
 import java.net.URL
 
+import coursier.cache.CacheLogger
 import coursier.{Cache, CachePolicy, FallbackDependenciesRepository, ProjectCache, Resolution, moduleNameString}
 import coursier.core._
 import coursier.extra.Typelevel
@@ -30,7 +31,7 @@ final case class ResolutionParams(
   parallelDownloads: Int,
   projectName: String,
   maxIterations: Int,
-  createLogger: () => Cache.Logger,
+  createLogger: () => CacheLogger,
   cache: File,
   cachePolicies: Seq[CachePolicy],
   ttl: Option[Duration],

modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionRun.scala

@@ -2,6 +2,7 @@ package coursier.lmcoursier
 
 import java.util.concurrent.ExecutorService
 
+import coursier.cache.CacheLogger
 import coursier.{Cache, Fetch, Resolution}
 import coursier.core._
 import coursier.ivy.IvyRepository
@@ -23,7 +24,7 @@ object ResolutionRun {
     // TODO Re-use the thread pool across resolutions / downloads?
     var pool: ExecutorService = null
 
-    var resLogger: Cache.Logger = null
+    var resLogger: CacheLogger = null
 
     val printOptionalMessage = verbosityLevel >= 0 && verbosityLevel <= 1
 

modules/sbt-coursier-shared/src/main/scala/coursier/sbtcoursiershared/SbtCoursierShared.scala

@@ -2,6 +2,7 @@ package coursier.sbtcoursiershared
 
 import java.io.{File, OutputStreamWriter}
 
+import coursier.cache.CacheDefaults
 import coursier.{Cache, Credentials, TermDisplay}
 import coursier.core.{Configuration, Project, Publication}
 import coursier.lmcoursier.{CreateLogger, FallbackDependency, SbtCoursierCache}
@@ -58,7 +59,7 @@ object SbtCoursierShared extends AutoPlugin {
       coursierUseSbtCredentials := true,
       coursierCredentials := Map.empty,
       coursierCreateLogger := CreateLogger { () => new TermDisplay(new OutputStreamWriter(System.err)) },
-      coursierCache := Cache.default
+      coursierCache := CacheDefaults.location
     )
 
   private val pluginIvySnapshotsBase = Resolver.SbtRepositoryRoot.stripSuffix("/") + "/ivy-snapshots"

modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/CoursierPlugin.scala

@@ -1,5 +1,6 @@
 package coursier.sbtcoursier
 
+import coursier.cache.CacheDefaults
 import coursier.{Cache, CachePolicy}
 import coursier.core.{Configuration, ResolutionProcess}
 import coursier.sbtcoursiershared.SbtCoursierShared
@@ -194,7 +195,7 @@ object CoursierPlugin extends AutoPlugin {
     coursierChecksums := Seq(Some("SHA-1"), None),
     coursierArtifactsChecksums := Seq(None),
     coursierCachePolicies := CachePolicy.default,
-    coursierTtl := Cache.defaultTtl,
+    coursierTtl := CacheDefaults.ttl,
     coursierVerbosity := Settings.defaultVerbosityLevel(sLog.value)
   )
 

modules/sbt-coursier/src/sbt-test/shared-1/logger/build.sbt

@@ -14,7 +14,7 @@ coursierCreateLogger := {
   }
   val cacheFile = coursierCache.value
   ;CoursierCreateLogger { () =>
-    new coursier.Cache.Logger {
+    new coursier.cache.CacheLogger {
       override def init(beforeOutput: => Unit): Unit = {
         beforeOutput
         log("init")