luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1177 from sbt/wip/issue-1176 

When fragmenting Defaults, we mixed back settings in the wrong order.
This commit is contained in:
Havoc Pennington 2014-03-12 09:13:58 -04:00
parent ad0ca70757 7c15eb01f3
commit a006235644
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/main/scala/sbt/Defaults.scala
View File

@ -971,7 +971,7 @@ object Classpaths
publishM2 <<= publishTask(publishM2Configuration, deliverLocal) publishM2 <<= publishTask(publishM2Configuration, deliverLocal)
) )
@deprecated("0.13.2", "This has been split into jvmIvySettings and ivyPublishSettings.") @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( private[this] def baseGlobalDefaults = Defaults.globalDefaults(Seq(
conflictWarning :== ConflictWarning.default("global"), conflictWarning :== ConflictWarning.default("global"),

8
sbt/src/sbt-test/project/default-settings/build.sbt Normal file
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!")
}

1
sbt/src/sbt-test/project/default-settings/test Normal file
View File

@ -0,0 +1 @@
> checkArtifacts