From 4752e180fd0bdd5bc5157d9f97cc7db647be584d Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 9 Jun 2024 17:56:17 -0400 Subject: [PATCH] Update lm --- main/src/main/scala/sbt/Defaults.scala | 7 +++++-- main/src/main/scala/sbt/RemoteCache.scala | 2 +- main/src/main/scala/sbt/coursierint/LMCoursier.scala | 6 +++--- main/src/main/scala/sbt/internal/Load.scala | 2 +- project/Dependencies.scala | 4 ++-- .../sbt/internal/inc/IvyBridgeProviderSpecification.scala | 2 +- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 28fcacfab..a741fa37c 100644 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -3390,7 +3390,10 @@ object Classpaths { val sv = scalaVersion.value s"$p/scala-$sv/$m" }, - ivyPaths := IvyPaths(baseDirectory.value, bootIvyHome(appConfiguration.value)), + ivyPaths := IvyPaths( + baseDirectory.value.toString, + bootIvyHome(appConfiguration.value).map(_.toString) + ), csrCacheDirectory := { val old = csrCacheDirectory.value val ac = appConfiguration.value @@ -3402,7 +3405,7 @@ object Classpaths { else if (ip.ivyHome == defaultIvyCache) old else ip.ivyHome match { - case Some(home) => home / "coursier-cache" + case Some(home) => new File(home) / "coursier-cache" case _ => old } } else Classpaths.dummyCoursierDirectory(ac) diff --git a/main/src/main/scala/sbt/RemoteCache.scala b/main/src/main/scala/sbt/RemoteCache.scala index faf2e88c1..14bc67ccd 100644 --- a/main/src/main/scala/sbt/RemoteCache.scala +++ b/main/src/main/scala/sbt/RemoteCache.scala @@ -80,7 +80,7 @@ object RemoteCache { val app = appConfiguration.value val base = app.baseDirectory.getCanonicalFile // base is used only to resolve relative paths, which should never happen - IvyPaths(base, localCacheDirectory.value) + IvyPaths(base.toString, localCacheDirectory.value.toString) }, rootOutputDirectory := { appConfiguration.value.baseDirectory diff --git a/main/src/main/scala/sbt/coursierint/LMCoursier.scala b/main/src/main/scala/sbt/coursierint/LMCoursier.scala index dd577c880..0838b90aa 100644 --- a/main/src/main/scala/sbt/coursierint/LMCoursier.scala +++ b/main/src/main/scala/sbt/coursierint/LMCoursier.scala @@ -167,7 +167,7 @@ object LMCoursier { csrLogger.value, csrCacheDirectory.value, csrReconciliations.value, - ivyPaths.value.ivyHome, + ivyPaths.value.ivyHome.map(new File(_)), CoursierInputsTasks.strictTask.value, dependencyOverrides.value, Some(updateConfiguration.value), @@ -202,7 +202,7 @@ object LMCoursier { csrLogger.value, csrCacheDirectory.value, csrReconciliations.value, - ivyPaths.value.ivyHome, + ivyPaths.value.ivyHome.map(new File(_)), CoursierInputsTasks.strictTask.value, dependencyOverrides.value, Some(updateConfiguration.value), @@ -230,7 +230,7 @@ object LMCoursier { csrLogger.value, csrCacheDirectory.value, csrReconciliations.value, - ivyPaths.value.ivyHome, + ivyPaths.value.ivyHome.map(new File(_)), CoursierInputsTasks.strictTask.value, dependencyOverrides.value, Some(updateConfiguration.value), diff --git a/main/src/main/scala/sbt/internal/Load.scala b/main/src/main/scala/sbt/internal/Load.scala index 54884a295..136be4f7a 100755 --- a/main/src/main/scala/sbt/internal/Load.scala +++ b/main/src/main/scala/sbt/internal/Load.scala @@ -87,7 +87,7 @@ private[sbt] object Load { val ivyConfiguration = InlineIvyConfiguration() .withPaths( - IvyPaths(baseDirectory, bootIvyHome(state.configuration)) + IvyPaths(baseDirectory.toString, bootIvyHome(state.configuration).map(_.toString)) ) .withResolvers(Resolver.combineDefaultResolvers(Vector.empty)) .withLog(log) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index e79a43378..d12246e87 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -15,7 +15,7 @@ object Dependencies { // sbt modules private val ioVersion = nightlyVersion.getOrElse("1.10.0") private val lmVersion = - sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("2.0.0-alpha15") + sys.props.get("sbt.build.lm.version").orElse(nightlyVersion).getOrElse("2.0.0-alpha16") val zincVersion = nightlyVersion.getOrElse("2.0.0-alpha14") private val sbtIO = "org.scala-sbt" %% "io" % ioVersion @@ -78,7 +78,7 @@ object Dependencies { def addSbtZincCompileCore = addSbtModule(sbtZincPath, "zincCompileCore", zincCompileCore) // val lmCoursierShaded = "io.get-coursier" %% "lm-coursier-shaded" % "2.0.10" - val lmCoursierShaded = "ch.epfl.scala" %% "librarymanagement-coursier" % "2.0.0-alpha8" + val lmCoursierShaded = "org.scala-sbt" %% "librarymanagement-coursier" % "2.0.0-alpha8" lazy val sjsonNewVersion = "0.14.0-M1" def sjsonNew(n: String) = Def.setting( diff --git a/zinc-lm-integration/src/test/scala/sbt/internal/inc/IvyBridgeProviderSpecification.scala b/zinc-lm-integration/src/test/scala/sbt/internal/inc/IvyBridgeProviderSpecification.scala index d4245b7c4..e2255cee2 100644 --- a/zinc-lm-integration/src/test/scala/sbt/internal/inc/IvyBridgeProviderSpecification.scala +++ b/zinc-lm-integration/src/test/scala/sbt/internal/inc/IvyBridgeProviderSpecification.scala @@ -89,7 +89,7 @@ abstract class IvyBridgeProviderSpecification val resolvers = resolvers0.toVector val chainResolver = ChainedResolver("zinc-chain", resolvers) InlineIvyConfiguration() - .withPaths(IvyPaths(baseDirectory, Some(ivyHome))) + .withPaths(IvyPaths(baseDirectory.toString, Some(ivyHome.toString))) .withResolvers(resolvers) .withModuleConfigurations(Vector(ModuleConfiguration("*", chainResolver))) .withLock(None)