From 80de6a5f6b11f52b4c8738a02b7cad36dc44e8e1 Mon Sep 17 00:00:00 2001 From: Adrien Piquerez Date: Sat, 20 Feb 2021 11:53:09 +0100 Subject: [PATCH] Add scripted auto-plugins-ivy-disabled --- .../sbt-test/project/auto-plugins-ivy-disabled/build.sbt | 6 ++++++ sbt/src/sbt-test/project/auto-plugins-ivy-disabled/test | 1 + sbt/src/sbt-test/project/auto-plugins/build.sbt | 6 +----- 3 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 sbt/src/sbt-test/project/auto-plugins-ivy-disabled/build.sbt create mode 100644 sbt/src/sbt-test/project/auto-plugins-ivy-disabled/test diff --git a/sbt/src/sbt-test/project/auto-plugins-ivy-disabled/build.sbt b/sbt/src/sbt-test/project/auto-plugins-ivy-disabled/build.sbt new file mode 100644 index 000000000..82a2f4d9d --- /dev/null +++ b/sbt/src/sbt-test/project/auto-plugins-ivy-disabled/build.sbt @@ -0,0 +1,6 @@ +disablePlugins(plugins.IvyPlugin) + +TaskKey[Unit]("check") := { + val pid = projectID.?.value + assert(pid.isEmpty) +} \ No newline at end of file diff --git a/sbt/src/sbt-test/project/auto-plugins-ivy-disabled/test b/sbt/src/sbt-test/project/auto-plugins-ivy-disabled/test new file mode 100644 index 000000000..a5912a391 --- /dev/null +++ b/sbt/src/sbt-test/project/auto-plugins-ivy-disabled/test @@ -0,0 +1 @@ +> check \ No newline at end of file diff --git a/sbt/src/sbt-test/project/auto-plugins/build.sbt b/sbt/src/sbt-test/project/auto-plugins/build.sbt index a4471b3c0..f564d4879 100644 --- a/sbt/src/sbt-test/project/auto-plugins/build.sbt +++ b/sbt/src/sbt-test/project/auto-plugins/build.sbt @@ -28,9 +28,6 @@ lazy val projI = project.enablePlugins(TopC) // Tests that we can disable an auto-enabled root plugin lazy val disableAutoNoRequirePlugin = project.disablePlugins(OrgPlugin) - -disablePlugins(plugins.IvyPlugin) - check := { // Ensure organization on root is overridable. val rorg = (organization).value // Should be None @@ -38,8 +35,7 @@ check := { // this will pass when the raw disablePlugin works. val dversion = (projectID in projD).?.value // Should be None 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 Quux in projF).?.value same(fDel, Some(" Q"), "del in Quux in projF")