[2.x] fix: Scala 3.8 REPL support

This commit is contained in:
Eugene Yokota 2025-12-15 23:48:36 -05:00
parent c187b6e1f5
commit 3518ae497e
2 changed files with 11 additions and 9 deletions

View File

@ -165,20 +165,22 @@ object Compiler:
yield file
val allCompilerJars = toolReport.modules.flatMap(_.artifacts.map(_._2))
val allDocJars =
fullReport
.configuration(Configurations.ScalaDocTool)
.map(updateLibraryToCompileConfiguration)
.toSeq
.flatMap(_.modules)
.flatMap(_.artifacts.map(_._2))
val extraToolJars = extraToolConf match
case Some(extra) =>
fullReport
.configuration(extra)
.map(updateLibraryToCompileConfiguration)
.toSeq
.flatMap(_.modules)
.flatMap(_.artifacts.map(_._2))
case None => Nil
val libraryJars = ScalaArtifacts.libraryIds(sv).flatMap(file)
makeScalaInstance(
sv,
libraryJars,
allCompilerJars,
allDocJars,
extraToolJars,
Keys.state.value,
Keys.scalaInstanceTopLoader.value,
)

View File

@ -12,7 +12,7 @@ object Dependencies {
// sbt modules
private val ioVersion = nightlyVersion.getOrElse("1.10.5")
val zincVersion = nightlyVersion.getOrElse("2.0.0-M9")
val zincVersion = nightlyVersion.getOrElse("2.0.0-M10")
private val sbtIO = "org.scala-sbt" %% "io" % ioVersion