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
This commit is contained in:
Josh Suereth 2014-03-12 08:50:37 -04:00
parent ad0ca70757
commit 7c15eb01f3
3 changed files with 10 additions and 1 deletions

View File

@ -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"),

View File

@ -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!")
}

View File

@ -0,0 +1 @@
> checkArtifacts