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

Merge pull request #8420 from eed3si9n/wip/bump-zinc 

[2.x] fix: Scala 3.8 REPL support
This commit is contained in:
eugene yokota 2025-12-16 23:45:27 -05:00 committed by GitHub
parent c187b6e1f5 3518ae497e
commit 07e33bc51e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/src/main/scala/sbt/internal/Compiler.scala
View File

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

2
project/Dependencies.scala
View File

@ -12,7 +12,7 @@ object Dependencies {
// sbt modules // sbt modules
private val ioVersion = nightlyVersion.getOrElse("1.10.5") 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 private val sbtIO = "org.scala-sbt" %% "io" % ioVersion