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

This commit is contained in:
Alexandre Archambault 2019-04-03 15:40:19 +02:00
parent 866d215707
commit 84d8d7ac38
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sbt
View File

@ -21,7 +21,7 @@ lazy val `lm-coursier` = project
.settings( .settings(
shared, shared,
libraryDependencies ++= Seq( 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 // We depend on librarymanagement-ivy rather than just
// librarymanagement-core to handle the ModuleDescriptor passed // librarymanagement-core to handle the ModuleDescriptor passed
// to DependencyResolutionInterface.update, which is an // to DependencyResolutionInterface.update, which is an

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

@ -5,7 +5,7 @@ import java.io.File
import _root_.coursier.{Artifact, Organization, Resolution, organizationString} import _root_.coursier.{Artifact, Organization, Resolution, organizationString}
import _root_.coursier.core.{Classifier, Configuration, ModuleName} import _root_.coursier.core.{Classifier, Configuration, ModuleName}
import _root_.coursier.lmcoursier.Inputs.withAuthenticationByHost import _root_.coursier.lmcoursier.Inputs.withAuthenticationByHost
import coursier.cache.{CacheDefaults, CachePolicy, FileCache} import coursier.cache.{CacheDefaults, FileCache}
import coursier.internal.Typelevel import coursier.internal.Typelevel
import sbt.internal.librarymanagement.IvySbt import sbt.internal.librarymanagement.IvySbt
import sbt.librarymanagement._ import sbt.librarymanagement._
@ -75,7 +75,7 @@ class CoursierDependencyResolution(conf: CoursierConfiguration) extends Dependen
val ttl = CacheDefaults.ttl val ttl = CacheDefaults.ttl
val loggerOpt = conf.logger val loggerOpt = conf.logger
val cache = conf.cache.getOrElse(CacheDefaults.location) val cache = conf.cache.getOrElse(CacheDefaults.location)
val cachePolicies = CachePolicy.default val cachePolicies = CacheDefaults.cachePolicies
val checksums = CacheDefaults.checksums val checksums = CacheDefaults.checksums
val projectName = "" // used for logging only… val projectName = "" // used for logging only…

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

@ -191,7 +191,7 @@ object CoursierPlugin extends AutoPlugin {
coursierMaxIterations := ResolutionProcess.defaultMaxIterations, coursierMaxIterations := ResolutionProcess.defaultMaxIterations,
coursierChecksums := Seq(Some("SHA-1"), None), coursierChecksums := Seq(Some("SHA-1"), None),
coursierArtifactsChecksums := Seq(None), coursierArtifactsChecksums := Seq(None),
coursierCachePolicies := CachePolicy.default, coursierCachePolicies := CacheDefaults.cachePolicies,
coursierTtl := CacheDefaults.ttl, coursierTtl := CacheDefaults.ttl,
coursierVerbosity := Settings.defaultVerbosityLevel(sLog.value) coursierVerbosity := Settings.defaultVerbosityLevel(sLog.value)
) )

5
modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/DisplayTasks.scala
View File

@ -2,9 +2,10 @@ package coursier.sbtcoursier
import coursier.core._ import coursier.core._
import coursier.lmcoursier._ import coursier.lmcoursier._
import coursier.parse.ModuleParser
import coursier.sbtcoursier.Keys._ import coursier.sbtcoursier.Keys._
import coursier.sbtcoursiershared.SbtCoursierShared.autoImport._ import coursier.sbtcoursiershared.SbtCoursierShared.autoImport._
import coursier.util.{Parse, Print} import coursier.util.Print
import sbt.Def import sbt.Def
import sbt.Keys._ import sbt.Keys._
@ -102,7 +103,7 @@ object DisplayTasks {
sbtClassifiers: Boolean = false, sbtClassifiers: Boolean = false,
ignoreArtifactErrors: Boolean = false ignoreArtifactErrors: Boolean = false
) = Def.task { ) = Def.task {
val module = Parse.module(moduleName, scalaVersion.value) val module = ModuleParser.module(moduleName, scalaVersion.value)
.right .right
.getOrElse(throw new RuntimeException(s"Could not parse module `$moduleName`")) .getOrElse(throw new RuntimeException(s"Could not parse module `$moduleName`"))