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

Refacto

This commit is contained in:
Alexandre Archambault 2020-06-13 16:27:53 +02:00
parent e601f843e5
commit f5f3fd12f8
3 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,9 +222,9 @@ class CoursierDependencyResolution(conf: CoursierConfiguration) extends Dependen
val e = for { val e = for {
resolutions <- ResolutionRun.resolutions(resolutionParams, verbosityLevel, log) resolutions <- ResolutionRun.resolutions(resolutionParams, verbosityLevel, log)
artifactsParams0 = artifactsParams(resolutions) artifactsParams0 = artifactsParams(resolutions)
artifacts <- ArtifactsRun.artifactsResult(artifactsParams0, verbosityLevel, log) artifacts <- ArtifactsRun(artifactsParams0, verbosityLevel, log)
} yield { } yield {
val updateParams0 = updateParams(resolutions, artifacts) val updateParams0 = updateParams(resolutions, artifacts.fullDetailedArtifacts)
UpdateRun.update(updateParams0, verbosityLevel, log) UpdateRun.update(updateParams0, verbosityLevel, log)
} }
e.left.map(unresolvedWarningOrThrow(uwconfig, _)) e.left.map(unresolvedWarningOrThrow(uwconfig, _))

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

@ -1,31 +1,19 @@
package lmcoursier.internal package lmcoursier.internal
import java.io.File import coursier.Artifacts
import coursier.cache.CacheLogger import coursier.cache.CacheLogger
import coursier.cache.loggers.{FallbackRefreshDisplay, ProgressBarRefreshDisplay, RefreshLogger} import coursier.cache.loggers.{FallbackRefreshDisplay, ProgressBarRefreshDisplay, RefreshLogger}
import coursier.core.Type import coursier.core.Type
import coursier.util.Artifact
import sbt.util.Logger import sbt.util.Logger
import coursier.core.Dependency
import coursier.core.Publication
// private[coursier] // private[lmcoursier]
object ArtifactsRun { object ArtifactsRun {
def artifacts( def apply(
params: ArtifactsParams, params: ArtifactsParams,
verbosityLevel: Int, verbosityLevel: Int,
log: Logger log: Logger
): Either[coursier.error.FetchError, Map[Artifact, File]] = ): Either[coursier.error.FetchError, Artifacts.Result] = {
artifactsResult(params, verbosityLevel, log)
.map(_.collect { case (_, _, a, Some(f)) => (a, f) }.toMap)
def artifactsResult(
params: ArtifactsParams,
verbosityLevel: Int,
log: Logger
): Either[coursier.error.FetchError, Seq[(Dependency, Publication, Artifact, Option[File])]] = {
val printOptionalMessage = verbosityLevel >= 0 && verbosityLevel <= 1 val printOptionalMessage = verbosityLevel >= 0 && verbosityLevel <= 1
@ -59,16 +47,16 @@ object ArtifactsRun {
if (needsLock) if (needsLock)
Lock.lock.synchronized { Lock.lock.synchronized {
artifactsResultNoLock(params, coursierLogger) result(params, coursierLogger)
} }
else else
artifactsResultNoLock(params, coursierLogger) result(params, coursierLogger)
} }
private def artifactsResultNoLock( private def result(
params: ArtifactsParams, params: ArtifactsParams,
coursierLogger: CacheLogger coursierLogger: CacheLogger
): Either[coursier.error.FetchError, Seq[(Dependency, Publication, Artifact, Option[File])]] = ): Either[coursier.error.FetchError, Artifacts.Result] =
coursier.Artifacts() coursier.Artifacts()
.withResolutions(params.resolutions) .withResolutions(params.resolutions)
.withArtifactTypes(Set(Type.all)) .withArtifactTypes(Set(Type.all))
@ -91,6 +79,5 @@ object ArtifactsRun {
} }
.withCache(params.cache.withLogger(coursierLogger)) .withCache(params.cache.withLogger(coursierLogger))
.eitherResult() .eitherResult()
.map(_.fullDetailedArtifacts) // FIXME Misses extraArtifacts, that we don't use for now though
} }

4
modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/ArtifactsTasks.scala
View File

@ -75,7 +75,7 @@ object ArtifactsTasks {
missingOk = sbtClassifiers missingOk = sbtClassifiers
) )
val resOrError = ArtifactsRun.artifacts( val resOrError = ArtifactsRun(
params, params,
verbosityLevel, verbosityLevel,
log log
@ -85,7 +85,7 @@ object ArtifactsTasks {
case Left(err) => case Left(err) =>
throw err throw err
case Right(res0) => case Right(res0) =>
res0 res0.artifacts.toMap
} }
} }
} }