mirror of
https://github.com/sbt/sbt.git
synced 2026-10-08 02:53:10 +02:00
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:
@@ -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"),
|
||||
|
||||
@@ -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!")
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
> checkArtifacts
|
||||
Reference in New Issue
Block a user