From dbcbad7e2bb975b16dba5b5210b02bf5bd836d81 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Wed, 6 Mar 2019 10:24:13 +0100 Subject: [PATCH] Switch to coursier 1.1.0-M13 --- build.sbt | 5 +---- .../src/main/scala/coursier/lmcoursier/ArtifactsRun.scala | 4 ++-- .../coursier/lmcoursier/CoursierDependencyResolution.scala | 2 +- .../main/scala/coursier/lmcoursier/ResolutionParams.scala | 5 +++-- .../src/main/scala/coursier/lmcoursier/ResolutionRun.scala | 4 ++-- .../main/scala/coursier/sbtcoursier/ResolutionTasks.scala | 2 +- modules/sbt-shading/src/main/scala/coursier/Shading.scala | 2 +- .../sbt-shading/src/main/scala/coursier/ShadingPlugin.scala | 2 +- 8 files changed, 12 insertions(+), 14 deletions(-) diff --git a/build.sbt b/build.sbt index bf6e64fbd..70b49c7a2 100644 --- a/build.sbt +++ b/build.sbt @@ -15,16 +15,13 @@ inThisBuild(List( ) )) -val coursierVersion = "1.1.0-M12" - lazy val `lm-coursier` = project .in(file("modules/lm-coursier")) .enablePlugins(ContrabandPlugin) .settings( shared, libraryDependencies ++= Seq( - "io.get-coursier" %% "coursier" % coursierVersion, - "io.get-coursier" %% "coursier-extra" % coursierVersion, + "io.get-coursier" %% "coursier" % "1.1.0-M13", // 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/ArtifactsRun.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ArtifactsRun.scala index 7d995391c..41737d70e 100644 --- a/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ArtifactsRun.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ArtifactsRun.scala @@ -6,7 +6,7 @@ import coursier.cache.FileCache import coursier.Artifact import coursier.cache.loggers.{ProgressBarRefreshDisplay, RefreshLogger} import coursier.core.Type -import coursier.util.Schedulable +import coursier.util.Sync import sbt.util.Logger object ArtifactsRun { @@ -29,7 +29,7 @@ object ArtifactsRun { else "" - Schedulable.withFixedThreadPool(params.cacheParams.parallel) { pool => + Sync.withFixedThreadPool(params.cacheParams.parallel) { pool => coursier.Artifacts() .withResolutions(params.resolutions) 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 b106635c4..2930f9945 100644 --- a/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierDependencyResolution.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierDependencyResolution.scala @@ -4,9 +4,9 @@ import java.io.File import _root_.coursier.{Artifact, Organization, Resolution, organizationString} import _root_.coursier.core.{Classifier, Configuration, ModuleName} -import _root_.coursier.extra.Typelevel import _root_.coursier.lmcoursier.Inputs.withAuthenticationByHost import coursier.cache.{CacheDefaults, CachePolicy} +import coursier.internal.Typelevel import coursier.params.CacheParams import sbt.internal.librarymanagement.IvySbt import sbt.librarymanagement._ diff --git a/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionParams.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionParams.scala index f980bcf6f..9c8f8e576 100644 --- a/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionParams.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionParams.scala @@ -3,8 +3,9 @@ package coursier.lmcoursier import java.io.File import coursier.cache.CacheLogger -import coursier.{FallbackDependenciesRepository, ProjectCache} +import coursier.ProjectCache import coursier.core._ +import coursier.util.InMemoryRepository import sbt.librarymanagement.{Resolver, URLRepository} final case class ResolutionParams( @@ -33,7 +34,7 @@ final case class ResolutionParams( }.toMap Seq( - FallbackDependenciesRepository(map) + InMemoryRepository(map) ) } diff --git a/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionRun.scala b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionRun.scala index 7ad211c02..8a07af83d 100644 --- a/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionRun.scala +++ b/modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionRun.scala @@ -6,7 +6,7 @@ import coursier.cache.loggers.{ProgressBarRefreshDisplay, RefreshLogger} import coursier.core._ import coursier.ivy.IvyRepository import coursier.maven.MavenRepository -import coursier.util.Schedulable +import coursier.util.Sync import sbt.util.Logger object ResolutionRun { @@ -64,7 +64,7 @@ object ResolutionRun { if (verbosityLevel >= 2) log.info(initialMessage) - Schedulable.withFixedThreadPool(params.cacheParams.parallel) { pool => + Sync.withFixedThreadPool(params.cacheParams.parallel) { pool => Resolve() .withDependencies( diff --git a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/ResolutionTasks.scala b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/ResolutionTasks.scala index c066a9e0b..da188a7cc 100644 --- a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/ResolutionTasks.scala +++ b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/ResolutionTasks.scala @@ -2,7 +2,7 @@ package coursier.sbtcoursier import coursier.ProjectCache import coursier.core._ -import coursier.extra.Typelevel +import coursier.internal.Typelevel import coursier.lmcoursier._ import coursier.lmcoursier.Inputs.withAuthenticationByHost import coursier.sbtcoursier.Keys._ diff --git a/modules/sbt-shading/src/main/scala/coursier/Shading.scala b/modules/sbt-shading/src/main/scala/coursier/Shading.scala index 77d9b5a63..dfeb45bcc 100644 --- a/modules/sbt-shading/src/main/scala/coursier/Shading.scala +++ b/modules/sbt-shading/src/main/scala/coursier/Shading.scala @@ -8,7 +8,7 @@ import com.tonicsystems.jarjar.classpath.ClassPath import com.tonicsystems.jarjar.transform.JarTransformer import com.tonicsystems.jarjar.transform.config.ClassRename import com.tonicsystems.jarjar.transform.jar.DefaultJarProcessor -import coursier.core.{Configuration, Orders, Type} +import coursier.core.{Configuration, Orders} import sbt.file object Shading { diff --git a/modules/sbt-shading/src/main/scala/coursier/ShadingPlugin.scala b/modules/sbt-shading/src/main/scala/coursier/ShadingPlugin.scala index f27ef8b90..f7412dff3 100644 --- a/modules/sbt-shading/src/main/scala/coursier/ShadingPlugin.scala +++ b/modules/sbt-shading/src/main/scala/coursier/ShadingPlugin.scala @@ -2,7 +2,7 @@ package coursier import java.io.File -import coursier.core.{Configuration, Type} +import coursier.core.Configuration import coursier.ivy.IvyXml.{mappings => ivyXmlMappings} import coursier.sbtcoursier.{CoursierPlugin, InputsTasks, Keys} import coursier.sbtcoursiershared.{IvyXml, SbtCoursierShared}