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

Update lm

This commit is contained in:
Eugene Yokota 2024-06-09 17:56:17 -04:00
parent 3ec8bd2269
commit 4752e180fd
6 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main/src/main/scala/sbt/Defaults.scala
View File

@ -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)

2
main/src/main/scala/sbt/RemoteCache.scala
View File

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

6
main/src/main/scala/sbt/coursierint/LMCoursier.scala
View File

@ -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),

2
main/src/main/scala/sbt/internal/Load.scala
View File

@ -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)

4
project/Dependencies.scala
View File

@ -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(

2
zinc-lm-integration/src/test/scala/sbt/internal/inc/IvyBridgeProviderSpecification.scala
View File

@ -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)