From 3518ae497ed12a25174f00b13f355526c57ce435 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Mon, 15 Dec 2025 23:48:36 -0500
Subject: [PATCH] [2.x] fix: Scala 3.8 REPL support

---
 .../src/main/scala/sbt/internal/Compiler.scala | 18 ++++++++++--------
 project/Dependencies.scala                     |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/main/src/main/scala/sbt/internal/Compiler.scala b/main/src/main/scala/sbt/internal/Compiler.scala
index be4d02143..03602ce5d 100644
--- a/main/src/main/scala/sbt/internal/Compiler.scala
+++ b/main/src/main/scala/sbt/internal/Compiler.scala
@@ -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,
     )
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 5442c8a0b..fea6aa3b9 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -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