From d4dc90efd92cb641bbd15644f0dd6f237f73def2 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Fri, 9 Dec 2022 02:05:19 -0500
Subject: [PATCH] add Conversion from Project => LocalProject

---
 main/src/main/scala/sbt/ProjectExtra.scala               | 5 +++--
 main/src/main/scala/sbt/internal/BuildUtil.scala         | 2 +-
 sbt-app/src/sbt-test/actions/aggregate/changes/build.sbt | 8 ++++----
 sbt-app/src/sbt-test/actions/aggregate/test              | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/main/src/main/scala/sbt/ProjectExtra.scala b/main/src/main/scala/sbt/ProjectExtra.scala
index 7afd97a44..b8d53e9e8 100755
--- a/main/src/main/scala/sbt/ProjectExtra.scala
+++ b/main/src/main/scala/sbt/ProjectExtra.scala
@@ -660,10 +660,11 @@ trait ProjectExtra:
 
     def projectToRef(p: Project): ProjectReference = LocalProject(p.id)
 
-    implicit def projectToLocalProject(p: Project): LocalProject = LocalProject(p.id)
-
      */
 
+  given projectToLocalProject: Conversion[Project, LocalProject] =
+    (p: Project) => LocalProject(p.id)
+
   extension [A1](in: Def.Initialize[Task[A1]])
     def updateState(f: (State, A1) => State): Def.Initialize[Task[A1]] =
       in(t => SessionVar.transform(t, f))
diff --git a/main/src/main/scala/sbt/internal/BuildUtil.scala b/main/src/main/scala/sbt/internal/BuildUtil.scala
index 6a3cf5087..946b09a84 100644
--- a/main/src/main/scala/sbt/internal/BuildUtil.scala
+++ b/main/src/main/scala/sbt/internal/BuildUtil.scala
@@ -90,7 +90,7 @@ object BuildUtil {
   }
 
   def baseImports: Seq[String] =
-    "import _root_.scala.xml.{TopScope=>$scope}" :: "import _root_.sbt._" :: "import _root_.sbt.Keys._" :: "import _root_.sbt.nio.Keys._" :: Nil
+    "import _root_.scala.xml.{TopScope=>$scope}" :: "import _root_.sbt.*" :: "import _root_.sbt.given" :: "import _root_.sbt.Keys.*" :: "import _root_.sbt.nio.Keys.*" :: Nil
 
   def getImports(unit: BuildUnit): Seq[String] =
     unit.plugins.detected.imports ++ unit.definitions.dslDefinitions.imports
diff --git a/sbt-app/src/sbt-test/actions/aggregate/changes/build.sbt b/sbt-app/src/sbt-test/actions/aggregate/changes/build.sbt
index d369e4f9c..53601ea4a 100644
--- a/sbt-app/src/sbt-test/actions/aggregate/changes/build.sbt
+++ b/sbt-app/src/sbt-test/actions/aggregate/changes/build.sbt
@@ -1,7 +1,7 @@
-lazy val root = (project in file(".")).
-  aggregate((if(file("aggregate").exists) Seq(sub: sbt.ProjectReference) else Nil): _*)
+lazy val root = (project in file("."))
+  .aggregate((if(file("aggregate").exists) Seq(sub: sbt.ProjectReference) else Nil): _*)
 
-lazy val sub = (project in file("sub")).
-  aggregate(sub2)
+lazy val sub = (project in file("sub"))
+  .aggregate(sub2)
 
 lazy val sub2 = (project in file("sub") / "sub")
diff --git a/sbt-app/src/sbt-test/actions/aggregate/test b/sbt-app/src/sbt-test/actions/aggregate/test
index fe508af1f..ed779d712 100644
--- a/sbt-app/src/sbt-test/actions/aggregate/test
+++ b/sbt-app/src/sbt-test/actions/aggregate/test
@@ -36,7 +36,7 @@ $ absent sub/ran
 $ delete ran
 
 # define in sub project, but shouldn't run without aggregation
-> set Mark in sub := mark(sub).value
+> set sub / Mark := mark(sub).value
 > mark
 $ exists ran
 $ absent sub/ran