diff --git a/build.sbt b/build.sbt index 6b253ab24..467c0dda4 100644 --- a/build.sbt +++ b/build.sbt @@ -15,7 +15,7 @@ inThisBuild(List( ) )) -val coursierVersion0 = "2.0.0-RC3-2" +val coursierVersion0 = "2.0.0-RC3-3" lazy val `lm-coursier` = project .enablePlugins(ContrabandPlugin) diff --git a/modules/lm-coursier/src/main/contraband/Reconciliation.contra b/modules/lm-coursier/src/main/contraband/Reconciliation.contra deleted file mode 100644 index d5a3665d5..000000000 --- a/modules/lm-coursier/src/main/contraband/Reconciliation.contra +++ /dev/null @@ -1,7 +0,0 @@ -package lmcoursier.definitions -@target(Scala) - -enum Reconciliation { - Default - Relaxed -} diff --git a/modules/lm-coursier/src/main/scala/lmcoursier/CoursierDependencyResolution.scala b/modules/lm-coursier/src/main/scala/lmcoursier/CoursierDependencyResolution.scala index 4c1eaa199..83a1887bc 100644 --- a/modules/lm-coursier/src/main/scala/lmcoursier/CoursierDependencyResolution.scala +++ b/modules/lm-coursier/src/main/scala/lmcoursier/CoursierDependencyResolution.scala @@ -2,9 +2,10 @@ package lmcoursier import java.io.File -import _root_.coursier.{Artifact, Organization, Resolution, organizationString} -import _root_.coursier.core.{Classifier, Configuration} +import coursier.{Organization, Resolution, organizationString} +import coursier.core.{Classifier, Configuration} import coursier.cache.CacheDefaults +import coursier.util.Artifact import coursier.internal.Typelevel import lmcoursier.definitions.ToCoursier import lmcoursier.internal.{ArtifactsParams, ArtifactsRun, CoursierModuleDescriptor, InterProjectRepository, ResolutionParams, ResolutionRun, Resolvers, SbtBootJars, UpdateParams, UpdateRun} diff --git a/modules/lm-coursier/src/main/scala/lmcoursier/internal/ArtifactsRun.scala b/modules/lm-coursier/src/main/scala/lmcoursier/internal/ArtifactsRun.scala index b67e64318..d60438b7c 100644 --- a/modules/lm-coursier/src/main/scala/lmcoursier/internal/ArtifactsRun.scala +++ b/modules/lm-coursier/src/main/scala/lmcoursier/internal/ArtifactsRun.scala @@ -2,10 +2,10 @@ package lmcoursier.internal import java.io.File -import coursier.Artifact import coursier.cache.internal.ThreadUtil import coursier.cache.loggers.{FallbackRefreshDisplay, ProgressBarRefreshDisplay, RefreshLogger} import coursier.core.Type +import coursier.util.Artifact import sbt.util.Logger // private[coursier] diff --git a/modules/lm-coursier/src/main/scala/lmcoursier/internal/InterProjectRepository.scala b/modules/lm-coursier/src/main/scala/lmcoursier/internal/InterProjectRepository.scala index fbb3ad218..fe682df25 100644 --- a/modules/lm-coursier/src/main/scala/lmcoursier/internal/InterProjectRepository.scala +++ b/modules/lm-coursier/src/main/scala/lmcoursier/internal/InterProjectRepository.scala @@ -16,7 +16,7 @@ final case class InterProjectRepository(projects: Seq[Project]) extends Reposito fetch: Repository.Fetch[F] )(implicit F: Monad[F] - ): EitherT[F, String, (Artifact.Source, Project)] = { + ): EitherT[F, String, (ArtifactSource, Project)] = { val res = map .get((module, version)) diff --git a/modules/lm-coursier/src/main/scala/lmcoursier/internal/SbtUpdateReport.scala b/modules/lm-coursier/src/main/scala/lmcoursier/internal/SbtUpdateReport.scala index 41c69fc74..93810a5b5 100644 --- a/modules/lm-coursier/src/main/scala/lmcoursier/internal/SbtUpdateReport.scala +++ b/modules/lm-coursier/src/main/scala/lmcoursier/internal/SbtUpdateReport.scala @@ -5,9 +5,10 @@ import java.net.URL import java.util.GregorianCalendar import java.util.concurrent.ConcurrentHashMap -import coursier.{Artifact, Attributes, Dependency, Module, Project, Resolution} +import coursier.{Attributes, Dependency, Module, Project, Resolution} import coursier.core.{Classifier, Configuration, Extension, Publication, Type} import coursier.maven.MavenAttributes +import coursier.util.Artifact import sbt.librarymanagement.{Artifact => _, Configuration => _, _} import sbt.util.Logger diff --git a/modules/lm-coursier/src/main/scala/lmcoursier/internal/TemporaryInMemoryRepository.scala b/modules/lm-coursier/src/main/scala/lmcoursier/internal/TemporaryInMemoryRepository.scala index a5b7e0711..bf67a9681 100644 --- a/modules/lm-coursier/src/main/scala/lmcoursier/internal/TemporaryInMemoryRepository.scala +++ b/modules/lm-coursier/src/main/scala/lmcoursier/internal/TemporaryInMemoryRepository.scala @@ -5,7 +5,7 @@ import java.net.{HttpURLConnection, URL, URLConnection} import coursier.cache.{CacheUrl, FileCache} import coursier.core._ -import coursier.util.{EitherT, Monad} +import coursier.util.{Artifact, EitherT, Monad} import scala.util.Try @@ -142,11 +142,11 @@ final class TemporaryInMemoryRepository private( fetch: Repository.Fetch[F] )(implicit F: Monad[F] - ): EitherT[F, String, (Artifact.Source, Project)] = { + ): EitherT[F, String, (ArtifactSource, Project)] = { def res = fallbacks .get((module, version)) - .fold[Either[String, (Artifact.Source, Project)]](Left("No fallback URL found")) { + .fold[Either[String, (ArtifactSource, Project)]](Left("No fallback URL found")) { case (url, _) => val urlStr = url.toExternalForm diff --git a/modules/lm-coursier/src/main/scala/lmcoursier/internal/UpdateParams.scala b/modules/lm-coursier/src/main/scala/lmcoursier/internal/UpdateParams.scala index 0b3b98fad..6b76c214c 100644 --- a/modules/lm-coursier/src/main/scala/lmcoursier/internal/UpdateParams.scala +++ b/modules/lm-coursier/src/main/scala/lmcoursier/internal/UpdateParams.scala @@ -3,6 +3,7 @@ package lmcoursier.internal import java.io.File import coursier.core._ +import coursier.util.Artifact // private[coursier] final case class UpdateParams( diff --git a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/ArtifactsTasks.scala b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/ArtifactsTasks.scala index 4f1a16aba..a3292bf20 100644 --- a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/ArtifactsTasks.scala +++ b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/ArtifactsTasks.scala @@ -2,9 +2,9 @@ package coursier.sbtcoursier import java.io.File -import coursier.Artifact import coursier.cache.FileCache import coursier.core._ +import coursier.util.Artifact import lmcoursier.internal.{ArtifactsParams, ArtifactsRun} import coursier.sbtcoursier.Keys._ import coursier.sbtcoursiershared.InputsTasks.credentialsTask diff --git a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/Keys.scala b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/Keys.scala index 1b896b0d6..4e4df6ad1 100644 --- a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/Keys.scala +++ b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/Keys.scala @@ -5,6 +5,7 @@ import java.io.File import coursier.cache.CachePolicy import coursier.ProjectCache import coursier.core._ +import coursier.util.Artifact import sbt.librarymanagement.{GetClassifiersModule, Resolver} import sbt.{InputKey, SettingKey, TaskKey} diff --git a/modules/sbt-shading/src/main/scala/coursier/Shading.scala b/modules/sbt-shading/src/main/scala/coursier/Shading.scala index 6f2ccdbd1..bc335fd62 100644 --- a/modules/sbt-shading/src/main/scala/coursier/Shading.scala +++ b/modules/sbt-shading/src/main/scala/coursier/Shading.scala @@ -5,6 +5,7 @@ import java.util.jar.JarInputStream import java.util.zip.{ZipEntry, ZipInputStream} import coursier.core.{Configuration, Orders} +import coursier.util.Artifact import org.pantsbuild.jarjar._ import org.pantsbuild.jarjar.util.CoursierJarProcessor