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

Drop deprecated seq method

This commit is contained in:
Dale Wijnand 2017-04-11 13:29:05 +01:00
parent 4ef5e85390
commit 01b19f0218
No known key found for this signature in database
GPG Key ID: 4F256E3D151DF5EF
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2415,10 +2415,6 @@ trait BuildExtra extends BuildCommon with DefExtra {
Seq(artLocal := artifact.value, taskLocal := taskDef.value, art, pkgd) Seq(artLocal := artifact.value, taskLocal := taskDef.value, art, pkgd)
} }
// because this was commonly used, this might need to be kept longer than usual
@deprecated("In build.sbt files, this call can be removed. In other cases, this can usually be replaced by Seq.", "0.13.0")
def seq(settings: Setting[_]*): SettingsDefinition = new Def.SettingList(settings)
def externalIvySettings(file: Initialize[File] = inBase("ivysettings.xml"), addMultiResolver: Boolean = true): Setting[Task[IvyConfiguration]] = def externalIvySettings(file: Initialize[File] = inBase("ivysettings.xml"), addMultiResolver: Boolean = true): Setting[Task[IvyConfiguration]] =
externalIvySettingsURI(file(_.toURI), addMultiResolver) externalIvySettingsURI(file(_.toURI), addMultiResolver)

2
sbt/src/sbt-test/dependency-management/ivy-settings-a/build.sbt
View File

@ -1,6 +1,6 @@
import sbt.internal.librarymanagement.syntax._ import sbt.internal.librarymanagement.syntax._
seq(externalIvySettings(), externalIvyFile()) Seq(externalIvySettings(), externalIvyFile())
TaskKey[Unit]("check") := { TaskKey[Unit]("check") := {
val files = update.value.matching( moduleFilter(organization = "org.scalacheck", name = "scalacheck*", revision = "1.11.4") ) val files = update.value.matching( moduleFilter(organization = "org.scalacheck", name = "scalacheck*", revision = "1.11.4") )

8
sbt/src/sbt-test/project/load-hooks/build.sbt
View File

@ -1,5 +1,3 @@
{ {
val loadCount = AttributeKey[Int]("load-count") val loadCount = AttributeKey[Int]("load-count")
val unloadCount = AttributeKey[Int]("unload-count") val unloadCount = AttributeKey[Int]("unload-count")
@ -7,9 +5,9 @@
val previous = s get key getOrElse 0 val previous = s get key getOrElse 0
s.put(key, previous + 1) s.put(key, previous + 1)
} }
seq( Seq(
onLoad in Global ~= (f(loadCount) compose _), onLoad in Global ~= (f(loadCount) compose _),
onUnload in Global ~= (f(unloadCount) compose _) onUnload in Global ~= (f(unloadCount) compose _)
) )
} }