luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch to coursier 1.1.0-M13

This commit is contained in:
Alexandre Archambault 2019-03-06 10:24:13 +01:00
parent 22e194db90
commit dbcbad7e2b
8 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.sbt
View File

@ -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

4
modules/lm-coursier/src/main/scala/coursier/lmcoursier/ArtifactsRun.scala
View File

@ -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)

2
modules/lm-coursier/src/main/scala/coursier/lmcoursier/CoursierDependencyResolution.scala
View File

@ -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._

5
modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionParams.scala
View File

@ -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)
)
}

4
modules/lm-coursier/src/main/scala/coursier/lmcoursier/ResolutionRun.scala
View File

@ -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(

2
modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/ResolutionTasks.scala
View File

@ -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._

2
modules/sbt-shading/src/main/scala/coursier/Shading.scala
View File

@ -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 {

2
modules/sbt-shading/src/main/scala/coursier/ShadingPlugin.scala
View File

@ -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}