From 535891f9f787c993e85c756c1f0885c88678b12b Mon Sep 17 00:00:00 2001
From: kenji yoshida <6b656e6a69@gmail.com>
Date: Sat, 21 Mar 2026 12:03:11 +0900
Subject: [PATCH] [2.x] test: Enable sbt-test/project/auto-plugins (#8947)

---
 .../sbt-test/project/auto-plugins/build.sbt   | 88 +++++++++----------
 .../project/auto-plugins/{pending => test}    |  0
 2 files changed, 44 insertions(+), 44 deletions(-)
 rename sbt-app/src/sbt-test/project/auto-plugins/{pending => test} (100%)

diff --git a/sbt-app/src/sbt-test/project/auto-plugins/build.sbt b/sbt-app/src/sbt-test/project/auto-plugins/build.sbt
index 2e3e445ea..8ae65da98 100644
--- a/sbt-app/src/sbt-test/project/auto-plugins/build.sbt
+++ b/sbt-app/src/sbt-test/project/auto-plugins/build.sbt
@@ -28,51 +28,51 @@ lazy val projI = project.enablePlugins(TopC)
 // Tests that we can disable an auto-enabled root plugin
 lazy val disableAutoNoRequirePlugin = project.disablePlugins(OrgPlugin)
 
-check := {
-  // Ensure organization on root is overridable.
-  val rorg = (organization).value // Should be None
-  same(rorg, "override", "organization")
-  // this will pass when the raw disablePlugin works.
-  val dversion = (projD / projectID).?.value // Should be None
-  same(dversion, None, "projectID in projD")
+lazy val root = rootProject.settings(
+  check := {
+    // Ensure organization on root is overridable.
+    val rorg = (organization).value // Should be None
+    same(rorg, "override", "organization")
+    // this will pass when the raw disablePlugin works.
+    val dversion = (projD / projectID).?.value // Should be None
+    same(dversion, None, "projectID in projD")
 
-  //  Ensure with multiple .sbt files that disabling/enabling works across them
-  val fDel = (projF / Quux / del).?.value
-  same(fDel, Some(" Q"), "del in Quux in projF")
-  //
-  val adel = (projA / del).?.value // should be None
-  same(adel, None, "del in projA")
-  val bdel = (projB / del).?.value // should be None
-  same(bdel, None, "del in projB")
-  val ddel = (projD / del).?.value // should be None
-  same(ddel, None, "del in projD")
-  //
-  val buildValue = (ThisBuild / demo).value
-  same(buildValue, "build 0", "demo in ThisBuild")
-  val globalValue = (Global / demo).value
-  same(globalValue, "global 0", "demo in Global")
-  val projValue = (projC / demo).?.value
-  same(projValue, Some("project projC Q R"), "demo in projC")
-  val qValue = (projC / Quux / del).?.value
-  same(qValue, Some(" Q R"), "del in projC in Quux")
-  val optInValue = (projE / Quux / del).value
-  same(optInValue, " Q S R", "del in projE in Quux")
-  val overrideOrgValue = (projE / organization).value
-  same(overrideOrgValue, "S", "organization in projE")
-  // tests for top level plugins
-  val topLevelAValueG = (projG / topLevelDemo).value
-  same(topLevelAValueG, "TopA: topLevelDemo project projG", "topLevelDemo in projG")
-  val demoValueG = (projG / demo).value
-  same(demoValueG, "TopA: demo project projG", "demo in projG")
-  val topLevelBValueH = (projH / topLevelDemo).value
-  same(topLevelBValueH, "TopB: topLevelDemo project projH", "topLevelDemo in projH")
-  val hdel = (projH / del).?.value
-  same(hdel, None, "del in projH")
-}
-
-keyTest := "foo"
-
-topLevelKeyTest := "bar"
+    //  Ensure with multiple .sbt files that disabling/enabling works across them
+    val fDel = (projF / Quux / del).?.value
+    same(fDel, Some(" Q"), "del in Quux in projF")
+    //
+    val adel = (projA / del).?.value // should be None
+    same(adel, None, "del in projA")
+    val bdel = (projB / del).?.value // should be None
+    same(bdel, None, "del in projB")
+    val ddel = (projD / del).?.value // should be None
+    same(ddel, None, "del in projD")
+    //
+    val buildValue = (ThisBuild / demo).value
+    same(buildValue, "build 0", "demo in ThisBuild")
+    val globalValue = (Global / demo).value
+    same(globalValue, "global 0", "demo in Global")
+    val projValue = (projC / demo).?.value
+    same(projValue, Some("project projC Q R"), "demo in projC")
+    val qValue = (projC / Quux / del).?.value
+    same(qValue, Some(" Q R"), "del in projC in Quux")
+    val optInValue = (projE / Quux / del).value
+    same(optInValue, " Q R S", "del in projE in Quux")
+    val overrideOrgValue = (projE / organization).value
+    same(overrideOrgValue, "S", "organization in projE")
+    // tests for top level plugins
+    val topLevelAValueG = (projG / topLevelDemo).value
+    same(topLevelAValueG, "TopA: topLevelDemo project projG", "topLevelDemo in projG")
+    val demoValueG = (projG / demo).value
+    same(demoValueG, "TopA: demo project projG", "demo in projG")
+    val topLevelBValueH = (projH / topLevelDemo).value
+    same(topLevelBValueH, "TopB: topLevelDemo project projH", "topLevelDemo in projH")
+    val hdel = (projH / del).?.value
+    same(hdel, None, "del in projH")
+  },
+  keyTest := "foo",
+  topLevelKeyTest := "bar"
+)
 
 def same[T](actual: T, expected: T, label: String): Unit = {
   assert(actual == expected, s"Expected '$expected' for `$label`, got '$actual'")
diff --git a/sbt-app/src/sbt-test/project/auto-plugins/pending b/sbt-app/src/sbt-test/project/auto-plugins/test
similarity index 100%
rename from sbt-app/src/sbt-test/project/auto-plugins/pending
rename to sbt-app/src/sbt-test/project/auto-plugins/test