Merge pull request #4071 from eed3si9n/wip/closewatch

Use MacOSXWatchService instead of PollingWatchService

main-command/src/main/scala/sbt/Watched.scala

@@ -134,14 +134,14 @@ object Watched {
     AttributeKey[Watched]("watched-configuration", "Configures continuous execution.")
 
   def createWatchService(): WatchService = {
+    def closeWatch = new MacOSXWatchService()
     sys.props.get("sbt.watch.mode") match {
       case Some("polling") =>
         new PollingWatchService(PollDelay)
       case Some("nio") =>
         FileSystems.getDefault.newWatchService()
-      case _ if Properties.isMac =>
-        // WatchService is slow on macOS - use old polling mode
-        new PollingWatchService(PollDelay)
+      case Some("closewatch")    => closeWatch
+      case _ if Properties.isMac => closeWatch
       case _ =>
         FileSystems.getDefault.newWatchService()
     }

project/Dependencies.scala

@@ -8,7 +8,7 @@ object Dependencies {
   val baseScalaVersion = scala212
 
   // sbt modules
-  private val ioVersion = "1.1.4"
+  private val ioVersion = "1.1.5"
   private val utilVersion = "1.1.3"
   private val lmVersion = "1.1.4"
   private val zincVersion = "1.1.3"