From 01b19f02182ccfe5eab1a13e2fdc086f8602e872 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Tue, 11 Apr 2017 13:29:05 +0100 Subject: [PATCH] Drop deprecated seq method --- main/src/main/scala/sbt/Defaults.scala | 4 ---- .../dependency-management/ivy-settings-a/build.sbt | 4 ++-- sbt/src/sbt-test/project/load-hooks/build.sbt | 8 +++----- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 1d98fa48c..e65a102ab 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -2415,10 +2415,6 @@ trait BuildExtra extends BuildCommon with DefExtra { 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]] = externalIvySettingsURI(file(_.toURI), addMultiResolver) diff --git a/sbt/src/sbt-test/dependency-management/ivy-settings-a/build.sbt b/sbt/src/sbt-test/dependency-management/ivy-settings-a/build.sbt index ed427e146..4972ad1ac 100644 --- a/sbt/src/sbt-test/dependency-management/ivy-settings-a/build.sbt +++ b/sbt/src/sbt-test/dependency-management/ivy-settings-a/build.sbt @@ -1,8 +1,8 @@ import sbt.internal.librarymanagement.syntax._ -seq(externalIvySettings(), externalIvyFile()) +Seq(externalIvySettings(), externalIvyFile()) TaskKey[Unit]("check") := { val files = update.value.matching( moduleFilter(organization = "org.scalacheck", name = "scalacheck*", revision = "1.11.4") ) assert(files.nonEmpty, "ScalaCheck module not found in update report") -} \ No newline at end of file +} diff --git a/sbt/src/sbt-test/project/load-hooks/build.sbt b/sbt/src/sbt-test/project/load-hooks/build.sbt index 60d7a7a36..93067dfbe 100644 --- a/sbt/src/sbt-test/project/load-hooks/build.sbt +++ b/sbt/src/sbt-test/project/load-hooks/build.sbt @@ -1,5 +1,3 @@ - - { val loadCount = AttributeKey[Int]("load-count") val unloadCount = AttributeKey[Int]("unload-count") @@ -7,9 +5,9 @@ val previous = s get key getOrElse 0 s.put(key, previous + 1) } - seq( - onLoad in Global ~= (f(loadCount) compose _), - onUnload in Global ~= (f(unloadCount) compose _) + Seq( + onLoad in Global ~= (f(loadCount) compose _), + onUnload in Global ~= (f(unloadCount) compose _) ) }