From 20b0ef786b7b5d0001291eabde7540de91d23be9 Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Tue, 16 Apr 2019 17:32:09 -0700 Subject: [PATCH] Undeprecate WatchSource Since the new watch implementation has yet to be widely deployed, we should hold off on deprecating the old keys. They could still be deprecated in a patch release or in 1.4.0. --- main-command/src/main/scala/sbt/Watched.scala | 2 -- main/src/main/scala/sbt/Keys.scala | 1 - 2 files changed, 3 deletions(-) diff --git a/main-command/src/main/scala/sbt/Watched.scala b/main-command/src/main/scala/sbt/Watched.scala index a2f79995c..703567e2f 100644 --- a/main-command/src/main/scala/sbt/Watched.scala +++ b/main-command/src/main/scala/sbt/Watched.scala @@ -51,7 +51,6 @@ trait Watched { object Watched { - @deprecated("WatchSource is replaced by sbt.io.Glob", "1.3.0") type WatchSource = Source def terminateWatch(key: Int): Boolean = Watched.isEnter(key) @@ -60,7 +59,6 @@ object Watched { def clearScreen: String = "\u001b[2J\u001b[0;0H" - @deprecated("WatchSource has been replaced by sbt.io.Glob", "1.3.0") object WatchSource { /** diff --git a/main/src/main/scala/sbt/Keys.scala b/main/src/main/scala/sbt/Keys.scala index 500e02f7c..b256758fd 100644 --- a/main/src/main/scala/sbt/Keys.scala +++ b/main/src/main/scala/sbt/Keys.scala @@ -124,7 +124,6 @@ object Keys { // Deprecated watch apis @deprecated("This is no longer used for continuous execution", "1.3.0") val watch = SettingKey(BasicKeys.watch) - @deprecated("WatchSource has been replaced by Glob. To add file triggers to a task with key: Key, set `Key / watchTriggers := Seq[Glob](...)`.", "1.3.0") val watchSources = taskKey[Seq[Watched.WatchSource]]("Defines the sources in this project for continuous execution to watch for changes.").withRank(BMinusSetting) @deprecated("This is for legacy builds only and will be removed in a future version of sbt", "1.3.0") val watchTransitiveSources = taskKey[Seq[Watched.WatchSource]]("Defines the sources in all projects for continuous execution to watch.").withRank(CSetting)