diff --git a/build.sbt b/build.sbt index 473412e74..4de1d44e7 100644 --- a/build.sbt +++ b/build.sbt @@ -21,7 +21,7 @@ lazy val `lm-coursier` = project .settings( shared, libraryDependencies ++= Seq( - "io.get-coursier" %% "coursier" % "1.1.0-M13-2", + "io.get-coursier" %% "coursier" % "1.1.0-M14-1", // We depend on librarymanagement-ivy rather than just // librarymanagement-core to handle the ModuleDescriptor passed // to DependencyResolutionInterface.update, which is an diff --git a/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierDependencyResolution.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierDependencyResolution.scala index a6ee832db..d6a0db792 100644 --- a/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierDependencyResolution.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierDependencyResolution.scala @@ -5,7 +5,7 @@ import java.io.File import _root_.coursier.{Artifact, Organization, Resolution, organizationString} import _root_.coursier.core.{Classifier, Configuration, ModuleName} import _root_.coursier.lmcoursier.Inputs.withAuthenticationByHost -import coursier.cache.{CacheDefaults, CachePolicy, FileCache} +import coursier.cache.{CacheDefaults, FileCache} import coursier.internal.Typelevel import sbt.internal.librarymanagement.IvySbt import sbt.librarymanagement._ @@ -75,7 +75,7 @@ class CoursierDependencyResolution(conf: CoursierConfiguration) extends Dependen val ttl = CacheDefaults.ttl val loggerOpt = conf.logger val cache = conf.cache.getOrElse(CacheDefaults.location) - val cachePolicies = CachePolicy.default + val cachePolicies = CacheDefaults.cachePolicies val checksums = CacheDefaults.checksums val projectName = "" // used for logging only… diff --git a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/CoursierPlugin.scala b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/CoursierPlugin.scala index fa164d19d..e76f84d8c 100644 --- a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/CoursierPlugin.scala +++ b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/CoursierPlugin.scala @@ -191,7 +191,7 @@ object CoursierPlugin extends AutoPlugin { coursierMaxIterations := ResolutionProcess.defaultMaxIterations, coursierChecksums := Seq(Some("SHA-1"), None), coursierArtifactsChecksums := Seq(None), - coursierCachePolicies := CachePolicy.default, + coursierCachePolicies := CacheDefaults.cachePolicies, coursierTtl := CacheDefaults.ttl, coursierVerbosity := Settings.defaultVerbosityLevel(sLog.value) ) diff --git a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/DisplayTasks.scala b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/DisplayTasks.scala index 0da889b8f..2ff2b5256 100644 --- a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/DisplayTasks.scala +++ b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/DisplayTasks.scala @@ -2,9 +2,10 @@ package coursier.sbtcoursier import coursier.core._ import coursier.lmcoursier._ +import coursier.parse.ModuleParser import coursier.sbtcoursier.Keys._ import coursier.sbtcoursiershared.SbtCoursierShared.autoImport._ -import coursier.util.{Parse, Print} +import coursier.util.Print import sbt.Def import sbt.Keys._ @@ -102,7 +103,7 @@ object DisplayTasks { sbtClassifiers: Boolean = false, ignoreArtifactErrors: Boolean = false ) = Def.task { - val module = Parse.module(moduleName, scalaVersion.value) + val module = ModuleParser.module(moduleName, scalaVersion.value) .right .getOrElse(throw new RuntimeException(s"Could not parse module `$moduleName`"))