From 7279f659e09aab001b826250fbfcb1bbdc4002c2 Mon Sep 17 00:00:00 2001
From: xuwei-k <6b656e6a69@gmail.com>
Date: Sat, 7 Sep 2024 16:37:49 +0900
Subject: [PATCH 1/2] Update .scalafmt.conf. re-format

---
 .scalafmt.conf                                    |  6 ------
 .../sbt/internal/util/SourcePositionMacro.scala   |  7 ++++---
 main-settings/src/main/scala/sbt/Def.scala        | 15 +++++++++++----
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.scalafmt.conf b/.scalafmt.conf
index 7b9ac01d6..ff4775593 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -23,9 +23,3 @@ align.openParenDefnSite = false
 danglingParentheses.preset = true
 
 trailingCommas = preserve
-
-# TODO update scalafmt and enable Scala 3
-project.excludeFilters = [
-  "internal/util-position/src/main/scala-3/sbt/internal/util/SourcePositionMacro.scala",
-  "main-settings/src/main/scala/sbt/Def.scala",
-]
diff --git a/internal/util-position/src/main/scala-3/sbt/internal/util/SourcePositionMacro.scala b/internal/util-position/src/main/scala-3/sbt/internal/util/SourcePositionMacro.scala
index f6e45f37d..2eca9fca8 100644
--- a/internal/util-position/src/main/scala-3/sbt/internal/util/SourcePositionMacro.scala
+++ b/internal/util-position/src/main/scala-3/sbt/internal/util/SourcePositionMacro.scala
@@ -11,7 +11,8 @@ import scala.quoted.{ Expr, Quotes, quotes }
 
 abstract class SourcePositionImpl {
 
-  /** Creates a SourcePosition by using the enclosing position of the invocation of this method.
+  /**
+   * Creates a SourcePosition by using the enclosing position of the invocation of this method.
    *
    * @return SourcePosition
    */
@@ -26,8 +27,8 @@ object SourcePositionImpl {
 
     '{
       LinePosition(
-        path = ${Expr(x.sourceFile.name)},
-        startLine = ${Expr(x.startLine + 1)}
+        path = ${ Expr(x.sourceFile.name) },
+        startLine = ${ Expr(x.startLine + 1) }
       )
     }
   }
diff --git a/main-settings/src/main/scala/sbt/Def.scala b/main-settings/src/main/scala/sbt/Def.scala
index d460e8ca0..0489bff91 100644
--- a/main-settings/src/main/scala/sbt/Def.scala
+++ b/main-settings/src/main/scala/sbt/Def.scala
@@ -16,7 +16,13 @@ import sbt.Scope.{ GlobalScope, ThisScope }
 import sbt.internal.util.Types.const
 import sbt.internal.util.complete.Parser
 import sbt.internal.util.{ Terminal => ITerminal, * }
-import sbt.util.{ ActionCacheStore, AggregateActionCacheStore, BuildWideCacheConfiguration, cacheLevel , DiskActionCacheStore }
+import sbt.util.{
+  ActionCacheStore,
+  AggregateActionCacheStore,
+  BuildWideCacheConfiguration,
+  cacheLevel,
+  DiskActionCacheStore
+}
 import Util._
 import sbt.util.Show
 import xsbti.{ HashedVirtualFileRef, VirtualFile, VirtualFileRef }
@@ -426,9 +432,10 @@ object Def extends Init[Scope] with TaskMacroExtra with InitializeImplicits:
 
   private[sbt] def dummyTask[T](name: String): Task[T] = {
     import TaskExtra.toTaskInfo
-    val base: Task[T] = TaskExtra.task(
-      sys.error(s"Dummy task '$name' did not get converted to a full task.")
-    )
+    val base: Task[T] = TaskExtra
+      .task(
+        sys.error(s"Dummy task '$name' did not get converted to a full task.")
+      )
       .named(name)
     base.copy(info = base.info.set(isDummyTask, true))
   }

From ca55e1402b5427bff3f2db52edaa163321bfd89d Mon Sep 17 00:00:00 2001
From: kenji yoshida <6b656e6a69@gmail.com>
Date: Sat, 7 Sep 2024 16:50:26 +0900
Subject: [PATCH 2/2] Update ci.yml

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8ef7f35c8..237c6cd9a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -77,7 +77,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: sbt/zinc
-          ref: wip/sbt-2.x
+          ref: develop
           path: zinc
       - name: Setup JDK
         uses: actions/setup-java@v4