From 6cf8611dee6703bb30ce270f7959a1c5e63714f7 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Wed, 14 Jan 2026 02:44:21 -0500
Subject: [PATCH] Scala 3.8.0

---
 .java-version                                    | 1 +
 buildfile/src/main/scala/sbt/internal/Eval.scala | 2 +-
 project/Dependencies.scala                       | 6 +++---
 project/build.properties                         | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 .java-version

diff --git a/.java-version b/.java-version
new file mode 100644
index 000000000..03b6389f3
--- /dev/null
+++ b/.java-version
@@ -0,0 +1 @@
+17.0
diff --git a/buildfile/src/main/scala/sbt/internal/Eval.scala b/buildfile/src/main/scala/sbt/internal/Eval.scala
index c030cb8cf..4d15adc76 100644
--- a/buildfile/src/main/scala/sbt/internal/Eval.scala
+++ b/buildfile/src/main/scala/sbt/internal/Eval.scala
@@ -10,7 +10,7 @@ import dotty.tools.dotc.Driver
 import dotty.tools.dotc.Run
 import dotty.tools.dotc.util.SourceFile
 import dotty.tools.io.{ PlainDirectory, Directory, VirtualDirectory, VirtualFile }
-import dotty.tools.repl.AbstractFileClassLoader
+import dotty.tools.io.AbstractFileClassLoader
 import java.io.File
 import java.net.URLClassLoader
 import java.nio.charset.StandardCharsets
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 0a7649ffc..5c133d84b 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -4,7 +4,7 @@ import Keys.*
 object Dependencies {
   // WARNING: Please Scala update versions in PluginCross.scala too
   val scala213 = "2.13.16"
-  val scala3 = "3.7.4"
+  val scala3 = "3.8.0"
   val scala212 = "2.12.21"
   val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up")
   val baseScalaVersion = scala3
@@ -12,8 +12,8 @@ object Dependencies {
     sys.env.get("BUILD_VERSION") orElse sys.props.get("sbt.build.version")
 
   // sbt modules
-  val ioVersion = nightlyVersion.getOrElse("1.10.5")
-  val zincVersion = nightlyVersion.getOrElse("2.0.0-M11")
+  val ioVersion = nightlyVersion.getOrElse("2.0.0-M1")
+  val zincVersion = nightlyVersion.getOrElse("2.0.0-M12")
 
   private val sbtIO = "org.scala-sbt" %% "io" % ioVersion
 
diff --git a/project/build.properties b/project/build.properties
index 5e6884d37..30b7fd9fd 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.11.6
+sbt.version=1.12.0