From f579e90ea05ea7e734356aa515a8b14c86ece4ed Mon Sep 17 00:00:00 2001 From: Josh Suereth Date: Wed, 7 May 2014 12:51:20 -0400 Subject: [PATCH] Add test confirming that multiple.sbt files can contribute to enable/disablePlugin DSL. --- sbt/src/sbt-test/project/auto-plugins/build.sbt | 5 +++++ sbt/src/sbt-test/project/auto-plugins/projF/a.sbt | 3 +++ sbt/src/sbt-test/project/auto-plugins/projF/b.sbt | 3 +++ 3 files changed, 11 insertions(+) create mode 100644 sbt/src/sbt-test/project/auto-plugins/projF/a.sbt create mode 100644 sbt/src/sbt-test/project/auto-plugins/projF/b.sbt diff --git a/sbt/src/sbt-test/project/auto-plugins/build.sbt b/sbt/src/sbt-test/project/auto-plugins/build.sbt index 779580b53..783e455ce 100644 --- a/sbt/src/sbt-test/project/auto-plugins/build.sbt +++ b/sbt/src/sbt-test/project/auto-plugins/build.sbt @@ -13,6 +13,8 @@ lazy val projD = project // with S selected, Q is loaded automatically, which in turn selects R lazy val projE = project.enablePlugins(S) +lazy val projF = project + disablePlugins(plugins.IvyPlugin) check := { @@ -21,6 +23,9 @@ check := { same(dversion, None, "projectID in projD") val rversion = projectID.?.value // Should be None same(rversion, None, "projectID") +// Ensure with multiple .sbt files that disabling/enabling works across them + val fDel = (del in q in projF).?.value + same(fDel, Some(" Q"), "del in q in projF") // val adel = (del in projA).?.value // should be None same(adel, None, "del in projA") diff --git a/sbt/src/sbt-test/project/auto-plugins/projF/a.sbt b/sbt/src/sbt-test/project/auto-plugins/projF/a.sbt new file mode 100644 index 000000000..d6ca3f337 --- /dev/null +++ b/sbt/src/sbt-test/project/auto-plugins/projF/a.sbt @@ -0,0 +1,3 @@ +import sbttest.Imports._ + +enablePlugins(A, B) \ No newline at end of file diff --git a/sbt/src/sbt-test/project/auto-plugins/projF/b.sbt b/sbt/src/sbt-test/project/auto-plugins/projF/b.sbt new file mode 100644 index 000000000..d1ba40b0a --- /dev/null +++ b/sbt/src/sbt-test/project/auto-plugins/projF/b.sbt @@ -0,0 +1,3 @@ +import sbttest.S + +disablePlugins(R) \ No newline at end of file