From 7c15eb01f388cf87b0d66425c0db45e5f04f6c95 Mon Sep 17 00:00:00 2001 From: Josh Suereth Date: Wed, 12 Mar 2014 08:50:37 -0400 Subject: [PATCH] When fragmenting Defaults, we mixed back settings in the wrong order. * packageArtifacts is not cleared by defautlSettings * Added a test for this behavior (this one test should ensure the ordering for most settings is correct.) Fixes #1176 --- main/src/main/scala/sbt/Defaults.scala | 2 +- sbt/src/sbt-test/project/default-settings/build.sbt | 8 ++++++++ sbt/src/sbt-test/project/default-settings/test | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 sbt/src/sbt-test/project/default-settings/build.sbt create mode 100644 sbt/src/sbt-test/project/default-settings/test diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index d01745b45..04b73d5ed 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -971,7 +971,7 @@ object Classpaths publishM2 <<= publishTask(publishM2Configuration, deliverLocal) ) @deprecated("0.13.2", "This has been split into jvmIvySettings and ivyPublishSettings.") - val publishSettings: Seq[Setting[_]] = jvmPublishSettings ++ ivyPublishSettings + val publishSettings: Seq[Setting[_]] = ivyPublishSettings ++ jvmPublishSettings private[this] def baseGlobalDefaults = Defaults.globalDefaults(Seq( conflictWarning :== ConflictWarning.default("global"), diff --git a/sbt/src/sbt-test/project/default-settings/build.sbt b/sbt/src/sbt-test/project/default-settings/build.sbt new file mode 100644 index 000000000..a00c6c634 --- /dev/null +++ b/sbt/src/sbt-test/project/default-settings/build.sbt @@ -0,0 +1,8 @@ + +val root = Project("root", file("."), settings=Defaults.defaultSettings) + + +TaskKey[Unit]("checkArtifacts", "test") := { + val arts = packagedArtifacts.value + assert(!arts.isEmpty, "Packaged artifacts must not be empty!") +} \ No newline at end of file diff --git a/sbt/src/sbt-test/project/default-settings/test b/sbt/src/sbt-test/project/default-settings/test new file mode 100644 index 000000000..0f165ede1 --- /dev/null +++ b/sbt/src/sbt-test/project/default-settings/test @@ -0,0 +1 @@ +> checkArtifacts \ No newline at end of file