diff --git a/lm-core/src/main/scala/sbt/librarymanagement/ConfigurationExtra.scala b/lm-core/src/main/scala/sbt/librarymanagement/ConfigurationExtra.scala index e5c18cd50..27143a9a4 100644 --- a/lm-core/src/main/scala/sbt/librarymanagement/ConfigurationExtra.scala +++ b/lm-core/src/main/scala/sbt/librarymanagement/ConfigurationExtra.scala @@ -3,7 +3,7 @@ */ package sbt.librarymanagement -import scala.annotation.{ nowarn, tailrec } +import scala.annotation.nowarn import scala.quoted.* object Configurations { diff --git a/lm-core/src/main/scala/sbt/librarymanagement/DependencyResolution.scala b/lm-core/src/main/scala/sbt/librarymanagement/DependencyResolution.scala index 71b85a272..8a0ccd996 100644 --- a/lm-core/src/main/scala/sbt/librarymanagement/DependencyResolution.scala +++ b/lm-core/src/main/scala/sbt/librarymanagement/DependencyResolution.scala @@ -161,33 +161,32 @@ class DependencyResolution private[sbt] (lmEngine: DependencyResolutionInterface artifacts: Vector[(String, ModuleID, Artifact, File)], log: Logger ): Either[UnresolvedWarning, UpdateReport] = { - import config.{ updateConfiguration => c, module => mod, _ } - import mod.{ configurations => confs, _ } - val artifactFilter = getArtifactTypeFilter(c.artifactFilter) + import config.module._ + val artifactFilter = getArtifactTypeFilter(config.updateConfiguration.artifactFilter) assert(classifiers.nonEmpty, "classifiers cannot be empty") assert(artifactFilter.types.nonEmpty, "UpdateConfiguration must filter on some types") val baseModules = dependencies map { m => restrictedCopy(m, true) } // Adding list of explicit artifacts here. - val exls = Map(excludes map { case (k, v) => (k, v.toSet) }: _*) + val exls = Map(config.excludes map { case (k, v) => (k, v.toSet) }: _*) val deps = baseModules.distinct flatMap classifiedArtifacts(classifiers, exls, artifacts) val base = restrictedCopy(id, true).withName(id.name + classifiers.mkString("$", "_", "")) val moduleSetting = ModuleDescriptorConfiguration(base, ModuleInfo(base.name)) .withScalaModuleInfo(scalaModuleInfo) .withDependencies(deps) - .withConfigurations(confs) + .withConfigurations(configurations) val module = moduleDescriptor(moduleSetting) // c.copy ensures c.types is preserved too - val upConf = c.withMissingOk(true) + val upConf = config.updateConfiguration.withMissingOk(true) update(module, upConf, uwconfig, log) match { case Right(r) => // The artifacts that came from Ivy don't have their classifier set, let's set it according to // FIXME: this is only done because IDE plugins depend on `classifier` to determine type. They val typeClassifierMap: Map[String, String] = - ((sourceArtifactTypes.toSeq map (_ -> Artifact.SourceClassifier)) - :: (docArtifactTypes.toSeq map (_ -> Artifact.DocClassifier)) :: Nil).flatten.toMap + ((config.sourceArtifactTypes.toSeq map (_ -> Artifact.SourceClassifier)) + :: (config.docArtifactTypes.toSeq map (_ -> Artifact.DocClassifier)) :: Nil).flatten.toMap Right(r.substitute { (conf, mid, artFileSeq) => artFileSeq map { case (art, f) => // Deduce the classifier from the type if no classifier is present already diff --git a/lm-core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala b/lm-core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala index cb0eebe80..58833429f 100644 --- a/lm-core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala +++ b/lm-core/src/main/scala/sbt/librarymanagement/ResolverExtra.scala @@ -10,7 +10,6 @@ import scala.xml.XML import org.xml.sax.SAXParseException import sbt.util.Logger -import java.net.URI import scala.util.matching.Regex final class RawRepository(val resolver: AnyRef, name: String) extends Resolver(name) { diff --git a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/mavenint/PomExtraDependencyAttributes.scala b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/mavenint/PomExtraDependencyAttributes.scala index 4811a1486..29c3e2dec 100644 --- a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/mavenint/PomExtraDependencyAttributes.scala +++ b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/mavenint/PomExtraDependencyAttributes.scala @@ -118,7 +118,7 @@ object PomExtraDependencyAttributes { if (filteredExtra.isEmpty) Nil else { - import scala.collection.JavaConverters._ + import scala.jdk.CollectionConverters._ val revId0 = ModuleRevisionId.newInstance( revId.getOrganisation, revId.getName, diff --git a/lm-ivy/src/test/scala/sbt/internal/librarymanagement/ComponentManagerTest.scala b/lm-ivy/src/test/scala/sbt/internal/librarymanagement/ComponentManagerTest.scala index f7e392aa8..5f85748e9 100644 --- a/lm-ivy/src/test/scala/sbt/internal/librarymanagement/ComponentManagerTest.scala +++ b/lm-ivy/src/test/scala/sbt/internal/librarymanagement/ComponentManagerTest.scala @@ -1,12 +1,5 @@ package sbt.internal.librarymanagement -import java.io.File -import java.util.concurrent.Callable -import sbt.io.IO.withTemporaryDirectory -import sbt.io.IO -import org.apache.ivy.util.ChecksumHelper -import IfMissing.Fail -import xsbti.ComponentProvider import verify.BasicTestSuite // TODO - We need to re-enable this test. Right now, we dont' have a "stub" launcher for this. diff --git a/lm-ivy/src/test/scala/sbt/internal/librarymanagement/PlatformResolutionSpec.scala b/lm-ivy/src/test/scala/sbt/internal/librarymanagement/PlatformResolutionSpec.scala index 39cc3d8c7..f6ce21736 100644 --- a/lm-ivy/src/test/scala/sbt/internal/librarymanagement/PlatformResolutionSpec.scala +++ b/lm-ivy/src/test/scala/sbt/internal/librarymanagement/PlatformResolutionSpec.scala @@ -1,14 +1,11 @@ package sbt.internal.librarymanagement -import sbt.util.ShowLines import sbt.librarymanagement.* import sbt.librarymanagement.syntax.* import sbt.librarymanagement.Platform.* object PlatformResolutionSpec extends BaseIvySpecification { - import TestShowLines.* - test("None platform resolves %% as JVM") { cleanCache() val m = exampleAutoModule(platform = None) diff --git a/lm-ivy/src/test/scala/sbt/internal/librarymanagement/ResolutionSpec.scala b/lm-ivy/src/test/scala/sbt/internal/librarymanagement/ResolutionSpec.scala index e7f1aefee..d85b4163a 100644 --- a/lm-ivy/src/test/scala/sbt/internal/librarymanagement/ResolutionSpec.scala +++ b/lm-ivy/src/test/scala/sbt/internal/librarymanagement/ResolutionSpec.scala @@ -1,6 +1,5 @@ package sbt.internal.librarymanagement -import org.scalatest.LoneElement._ import sbt.util.ShowLines import sbt.librarymanagement._ import sbt.librarymanagement.syntax._ diff --git a/lm-ivy/src/test/scala/sbt/internal/librarymanagement/ScalaOverrideTest.scala b/lm-ivy/src/test/scala/sbt/internal/librarymanagement/ScalaOverrideTest.scala index 7f9289e81..688f11baf 100644 --- a/lm-ivy/src/test/scala/sbt/internal/librarymanagement/ScalaOverrideTest.scala +++ b/lm-ivy/src/test/scala/sbt/internal/librarymanagement/ScalaOverrideTest.scala @@ -1,11 +1,11 @@ package sbt.internal.librarymanagement -import org.apache.ivy.core.module.id.ModuleRevisionId -import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor +// import org.apache.ivy.core.module.id.ModuleRevisionId +// import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor -import sbt.internal.librarymanagement.IvyScalaUtil.OverrideScalaMediator -import sbt.librarymanagement._ -import sbt.librarymanagement.ScalaArtifacts._ +// import sbt.internal.librarymanagement.IvyScalaUtil.OverrideScalaMediator +// import sbt.librarymanagement._ +// import sbt.librarymanagement.ScalaArtifacts._ import verify.BasicTestSuite object ScalaOverrideTest extends BasicTestSuite { diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 5e0c9eba6..d831bc94f 100644 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -3305,11 +3305,11 @@ object Classpaths { projectInfo := ModuleInfo( name.value, description.value, - homepage.value, + homepage.value.map(_.toURI), startYear.value, - licenses.value.toVector, + licenses.value.map((name, url) => (name, url.toURI)).toVector, organizationName.value, - organizationHomepage.value, + organizationHomepage.value.map(_.toURI), scmInfo.value, developers.value.toVector ), diff --git a/zinc-lm-integration/src/main/scala/sbt/internal/inc/ZincComponentCompiler.scala b/zinc-lm-integration/src/main/scala/sbt/internal/inc/ZincComponentCompiler.scala index 05a9ea6f1..9d7291d7a 100644 --- a/zinc-lm-integration/src/main/scala/sbt/internal/inc/ZincComponentCompiler.scala +++ b/zinc-lm-integration/src/main/scala/sbt/internal/inc/ZincComponentCompiler.scala @@ -11,7 +11,7 @@ package internal package inc import sbt.internal.inc.classpath.ClasspathUtil -import sbt.internal.librarymanagement._ +import sbt.internal.librarymanagement.JsonUtil import sbt.internal.util.{ BufferedLogger, FullLogger } import sbt.io.IO import sbt.librarymanagement._