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

[2.x] refactor: Remove nowarn annotation in CoursierDependencyResolution (#9593)

This commit is contained in:
kenji yoshida 2026-08-14 21:53:42 +09:00 committed by GitHub
parent a94ef44178
commit d560776a77
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import coursier.{ Organization, Resolution }
import coursier.core.{ Classifier, Configuration, Dependency, VariantPublication, Publication } import coursier.core.{ Classifier, Configuration, Dependency, VariantPublication, Publication }
import coursier.cache.CacheDefaults import coursier.cache.CacheDefaults
import coursier.util.Artifact import coursier.util.Artifact
import coursier.version.VersionConstraint
import lmcoursier.definitions.ToCoursier import lmcoursier.definitions.ToCoursier
import lmcoursier.internal.{ import lmcoursier.internal.{
ArtifactsParams, ArtifactsParams,
@ -27,7 +28,6 @@ import lmcoursier.syntax.*
import sbt.librarymanagement.* import sbt.librarymanagement.*
import sbt.util.Logger import sbt.util.Logger
import coursier.core.BomDependency import coursier.core.BomDependency
import scala.annotation.nowarn
import scala.util.control.NonFatal import scala.util.control.NonFatal
import scala.util.{ Try, Failure } import scala.util.{ Try, Failure }
@ -228,9 +228,7 @@ class CoursierDependencyResolution(
optionalCrossVer = true, optionalCrossVer = true,
projectPlatform = projectPlatform projectPlatform = projectPlatform
) )
(BomDependency(ToCoursier.module(mod), ver, Configuration.empty): @nowarn( BomDependency(ToCoursier.module(mod), VersionConstraint(ver), Configuration.empty)
"msg=BomDependency is deprecated"
))
} }
// Coursier fills version from BOM only when versionConstraint is empty (Resolution.processedRootDependencies). // Coursier fills version from BOM only when versionConstraint is empty (Resolution.processedRootDependencies).
// So for deps with "*" or "" and BOMs present, pass empty version so BOM can supply it (sbt#4531). // So for deps with "*" or "" and BOMs present, pass empty version so BOM can supply it (sbt#4531).
@ -520,7 +518,7 @@ class CoursierDependencyResolution(
downloadErrors: Seq[coursier.error.ResolutionError.CantDownloadModule] downloadErrors: Seq[coursier.error.ResolutionError.CantDownloadModule]
): Map[ModuleID, Seq[ModuleID]] = ): Map[ModuleID, Seq[ModuleID]] =
downloadErrors.map { err => downloadErrors.map { err =>
val failedDependency = (Dependency(err.module, err.versionConstraint.asString): @nowarn) val failedDependency = Dependency(err.module, err.versionConstraint)
val failedModule = toModuleId(err.module, err.versionConstraint.asString) val failedModule = toModuleId(err.module, err.versionConstraint.asString)
failedModule -> resolvePath(resolution, failedDependency, rootModule) failedModule -> resolvePath(resolution, failedDependency, rootModule)
}.toMap }.toMap