From 3e62b983a2996e7ef843483098cf5d0e960675ab Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Mon, 20 Aug 2018 13:26:52 -0700 Subject: [PATCH] Remove intellij warnings --- main-command/src/main/scala/sbt/Watched.scala | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/main-command/src/main/scala/sbt/Watched.scala b/main-command/src/main/scala/sbt/Watched.scala index 1331fd97d..f107a09d7 100644 --- a/main-command/src/main/scala/sbt/Watched.scala +++ b/main-command/src/main/scala/sbt/Watched.scala @@ -89,12 +89,13 @@ object Watched { def multi(base: Watched, paths: Seq[Watched]): Watched = new AWatched { - override def watchSources(s: State) = (base.watchSources(s) /: paths)(_ ++ _.watchSources(s)) + override def watchSources(s: State): Seq[Watched.WatchSource] = + (base.watchSources(s) /: paths)(_ ++ _.watchSources(s)) override def terminateWatch(key: Int): Boolean = base.terminateWatch(key) - override val pollInterval = (base +: paths).map(_.pollInterval).min - override val antiEntropy = (base +: paths).map(_.antiEntropy).min - override def watchingMessage(s: WatchState) = base.watchingMessage(s) - override def triggeredMessage(s: WatchState) = base.triggeredMessage(s) + override val pollInterval: FiniteDuration = (base +: paths).map(_.pollInterval).min + override val antiEntropy: FiniteDuration = (base +: paths).map(_.antiEntropy).min + override def watchingMessage(s: WatchState): String = base.watchingMessage(s) + override def triggeredMessage(s: WatchState): String = base.triggeredMessage(s) } def empty: Watched = new AWatched