Merge pull request #143 from steinybot/set-mode-everywhere

Set mode in every scope
typelevel · Mar 31, 2023 · 8811599 · 8811599
2 parents 879c3ee + 290c5f4
commit 8811599
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 3 deletions.
diff --git a/plugin/src/main/scala/io/github/davidgregory084/TpolecatPlugin.scala b/plugin/src/main/scala/io/github/davidgregory084/TpolecatPlugin.scala
@@ -110,15 +110,15 @@ object TpolecatPlugin extends AutoPlugin {
   val commandAliases =
     addCommandAlias(
       "tpolecatDevMode",
-      "set ThisBuild / tpolecatOptionsMode := _root_.io.github.davidgregory084.DevMode"
+      "set every tpolecatOptionsMode := _root_.io.github.davidgregory084.DevMode"
     ) ++
       addCommandAlias(
         "tpolecatCiMode",
-        "set ThisBuild / tpolecatOptionsMode := _root_.io.github.davidgregory084.CiMode"
+        "set every tpolecatOptionsMode := _root_.io.github.davidgregory084.CiMode"
       ) ++
       addCommandAlias(
         "tpolecatReleaseMode",
-        "set ThisBuild / tpolecatOptionsMode := _root_.io.github.davidgregory084.ReleaseMode"
+        "set every tpolecatOptionsMode := _root_.io.github.davidgregory084.ReleaseMode"
       )
 
   override def buildSettings: Seq[Setting[_]] = Seq(

diff --git a/plugin/src/sbt-test/sbt-tpolecat/modeCommand/build.sbt b/plugin/src/sbt-test/sbt-tpolecat/modeCommand/build.sbt
@@ -0,0 +1,13 @@
+import _root_.io.github.davidgregory084._
+
+lazy val subProject = project
+  .settings(tpolecatOptionsMode := CiMode)
+
+lazy val subProjectWithConfig = project
+  .settings(Test / tpolecatOptionsMode := CiMode)
+
+TaskKey[Unit]("check") := {
+  assert(tpolecatOptionsMode.value == DevMode)
+  assert((subProject / tpolecatOptionsMode).value == DevMode)
+  assert((subProjectWithConfig / Test / tpolecatOptionsMode).value == DevMode)
+}
diff --git a/plugin/src/sbt-test/sbt-tpolecat/modeCommand/project/build.properties b/plugin/src/sbt-test/sbt-tpolecat/modeCommand/project/build.properties
@@ -0,0 +1 @@
+sbt.version=1.7.1
diff --git a/plugin/src/sbt-test/sbt-tpolecat/modeCommand/project/plugins.sbt b/plugin/src/sbt-test/sbt-tpolecat/modeCommand/project/plugins.sbt
@@ -0,0 +1 @@
+addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % System.getProperty("plugin.version"))
diff --git a/plugin/src/sbt-test/sbt-tpolecat/modeCommand/test b/plugin/src/sbt-test/sbt-tpolecat/modeCommand/test
@@ -0,0 +1,3 @@
+# Check that the mode is applied everywhere.
+> tpolecatDevMode
+> +check
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % System.getProperty("plugin.version"))