From 083dba59d6991f3e1dbda0daa1dc0ddfe55dcd57 Mon Sep 17 00:00:00 2001
From: Matthias Kurz <m.kurz@irregular.at>
Date: Sun, 12 Apr 2026 20:02:05 +0200
Subject: [PATCH 1/2] [2.x] add no-op addDependencyTreePlugin shim for
 migration (#9067)

(cherry picked from commit e515decfc5c86807e8a0f871d122a20e148b613a)
---
 main/src/main/scala/sbt/Defaults.scala                     | 7 +++++++
 .../project/add-dependency-tree-plugin-shim/build.sbt      | 5 +++++
 .../add-dependency-tree-plugin-shim/project/plugins.sbt    | 2 ++
 .../sbt-test/project/add-dependency-tree-plugin-shim/test  | 1 +
 4 files changed, 15 insertions(+)
 create mode 100644 sbt-app/src/sbt-test/project/add-dependency-tree-plugin-shim/build.sbt
 create mode 100644 sbt-app/src/sbt-test/project/add-dependency-tree-plugin-shim/project/plugins.sbt
 create mode 100644 sbt-app/src/sbt-test/project/add-dependency-tree-plugin-shim/test

diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index 7ec2d417b..3e6646df4 100644
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -4739,6 +4739,13 @@ trait BuildExtra extends BuildCommon with DefExtra {
     Seq(compose(onLoad, add), compose(onUnload, remove))
   }
 
+  /**
+   * Adds dependency tree plugin.
+   */
+  @deprecated("dependencyTree is built into sbt 2.x; this is now a no-op", "2.0.0")
+  def addDependencyTreePlugin: Setting[Seq[ModuleID]] =
+    libraryDependencies ++= Nil
+
   /**
    * Adds Maven resolver plugin.
    */
diff --git a/sbt-app/src/sbt-test/project/add-dependency-tree-plugin-shim/build.sbt b/sbt-app/src/sbt-test/project/add-dependency-tree-plugin-shim/build.sbt
new file mode 100644
index 000000000..5ed743ee7
--- /dev/null
+++ b/sbt-app/src/sbt-test/project/add-dependency-tree-plugin-shim/build.sbt
@@ -0,0 +1,5 @@
+import sbtassembly.AssemblyPlugin.autoImport._
+
+assembly / assemblyJarName := "plugin-survived.jar"
+
+TaskKey[Unit]("check") := ()
diff --git a/sbt-app/src/sbt-test/project/add-dependency-tree-plugin-shim/project/plugins.sbt b/sbt-app/src/sbt-test/project/add-dependency-tree-plugin-shim/project/plugins.sbt
new file mode 100644
index 000000000..70e5a6638
--- /dev/null
+++ b/sbt-app/src/sbt-test/project/add-dependency-tree-plugin-shim/project/plugins.sbt
@@ -0,0 +1,2 @@
+addDependencyTreePlugin
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.1")
diff --git a/sbt-app/src/sbt-test/project/add-dependency-tree-plugin-shim/test b/sbt-app/src/sbt-test/project/add-dependency-tree-plugin-shim/test
new file mode 100644
index 000000000..15675b169
--- /dev/null
+++ b/sbt-app/src/sbt-test/project/add-dependency-tree-plugin-shim/test
@@ -0,0 +1 @@
+> check

From 639a19d262ba3315297bec8df6c54d7fc452838b Mon Sep 17 00:00:00 2001
From: xuwei-k <6b656e6a69@gmail.com>
Date: Mon, 13 Apr 2026 18:59:42 +0900
Subject: [PATCH 2/2] Update mimaPreviousArtifacts

---
 build.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sbt b/build.sbt
index 5722eacdd..f5d84cdd6 100644
--- a/build.sbt
+++ b/build.sbt
@@ -124,7 +124,7 @@ def testedBaseSettings: Seq[Setting[?]] =
 
 val sbt20Plus =
   Seq(
-    "2.0.0-RC11",
+    "2.0.0-RC12",
   )
 val mimaSettings = mimaSettingsSince(sbt20Plus)
 def mimaSettingsSince(versions: Seq[String]): Seq[Def.Setting[?]] = Def settings (