Merge pull request #226 from eatkins/refactor

Refactor all of the glob/watch related interfaces

.travis.yml

@@ -4,6 +4,7 @@ env:
   global:
   - TRAVIS_SCALA_VERSION=2.12.8
   - SBT_VER=1.2.4
+  - TEST_FORK=true
   - secure: HFp0Jm4r+bk7CKT5YJX6rlqo0+itHfcae0gC4BY7rNrv8JN7POHs+Db2BeCwwOJXKFxHDxFjLyKwzX4LcFkBzQataUfzqHvBlkLh2XkCkMUZsOt4xhflwJZMXYihLyoX0Wct42AE4DWmBiFiC5wePI6/7/nWFk+gv0KN+X8zK0y1WdtZR6PqyFxE0NengnRB9sliiDQU2ESdZ7zuoMytbRDlcmTqj70C8ym9KGLdZvM/8R7n+5GGbkfvCXAiNnYDd2uARw/Ep4JDqM/UoXC21NqOknIHuaC3j3Rb66+wgNev+Nmfg5YU1mGWWGWSsFPTh6MVuUM84aFtoStUwsTSjvVvHTrzPyHEg4kP44Qco5fdRgDQUz+7MVOjVL4hogW0eLSiVceOle7tcN6Q5zn/5wNaKoJRJjo9Dw5zEI+w4AgEkiky/TKRnJQiqzTbLQ2kN9ALGJAHan1+Kg7SaC5GWdjm6bDFz4zjbAPYEqPosePRB9X2sxUjndTE/HYLgLLqK5yIUj06XY7YNmWOwRS83+5VzwAl82lkfaI9oXb8Giy7XiAtT0jfviAHwSx1fo1QRyBUCCPyxiLccgFLCFyaUBwwUXXBEieWJWLbRIbScj3b0RTZRtR/VZ54rz3rMzDxD9J09x7NGJvn3Ext0ampMuOcJpEHOy2akojZ60qQcV8=
 
 matrix:
@@ -12,8 +13,13 @@ matrix:
      env:
          CMD="mimaReportBinaryIssues scalafmtCheck test whitesourceCheckPolicies doc"
          TRAVIS_SCALA_VERSION=2.12.8
+         [email protected]
      os: linux
      dist: trusty
+     install:
+         - $JABBA_HOME/bin/jabba install $TRAVIS_JDK
+         - unset _JAVA_OPTIONS
+         - export JAVA_HOME="$JABBA_HOME/jdk/$TRAVIS_JDK" && export PATH="$JAVA_HOME/bin:$PATH" && java -Xmx32m -version
 
    - scala: 2.12.8
      env:
@@ -33,23 +39,31 @@ matrix:
 
    - scala: 2.13.0-RC1
      env:
+       TEST_FORK=false
        CMD="test"
        TRAVIS_SCALA_VERSION=2.13.0-RC1
+       [email protected]
      os: linux
      dist: trusty
+     install:
+         - $JABBA_HOME/bin/jabba install $TRAVIS_JDK
+         - unset _JAVA_OPTIONS
+         - export JAVA_HOME="$JABBA_HOME/jdk/$TRAVIS_JDK" && export PATH="$JAVA_HOME/bin:$PATH" && java -Xmx32m -version
 
    - scala: 2.13.0-RC1
      os: osx
      env:
+       TEST_FORK=false
        CMD="test"
        TRAVIS_SCALA_VERSION=2.13.0-RC1
      language: java
      osx_image: xcode9.3
 
-script: /tmp/sbt/bin/sbt -Dsbt.version=$SBT_VER ++$TRAVIS_SCALA_VERSION $CMD
+script: /tmp/sbt/bin/sbt -Dsbt.test.fork=$TEST_FORK -Dsbt.version=$SBT_VER ++$TRAVIS_SCALA_VERSION $CMD
 
 before_install:
   # https://github.com/travis-ci/travis-ci/issues/8408
+  - curl -sL https://raw.githubusercontent.com/shyiko/jabba/0.11.0/install.sh | bash && . ~/.jabba/jabba.sh
   - unset _JAVA_OPTIONS
   - wget https://github.com/sbt/sbt/releases/download/v$SBT_VER/sbt-$SBT_VER.tgz;
   - tar -xvf sbt-$SBT_VER.tgz;

build.sbt

@@ -60,7 +60,8 @@ val io = (project in file("io"))
     } ++ Vector(swovalFiles),
     libraryDependencies ++= Seq(jna, jnaPlatform),
 
-    Test / fork := true,
+    Test / fork := System.getProperty("sbt.test.fork", "true") == "true",
+    Test / testForkedParallel := true,
 
     sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala",
     initialCommands in console += "\nimport sbt.io._, syntax._",
@@ -112,9 +113,13 @@ val io = (project in file("io"))
       exclude[MissingClassProblem]("sbt.io.Event"),
       exclude[MissingClassProblem]("sbt.io.Event$"),
       exclude[MissingClassProblem]("sbt.io.MacOSXWatchKey"),
+      exclude[MissingClassProblem]("sbt.io.PollingWatchEvent"),
+      exclude[MissingClassProblem]("sbt.io.PollingWatchService$PollingWatchKey"),
+      exclude[MissingClassProblem]("sbt.io.PollingWatchService$PollingThread"),
+      exclude[MissingClassProblem]("sbt.io.PollingWatchService$Overflow$"),
 
       // private internal classes whose functionality has been replaced
-      exclude[MissingClassProblem]("sbt.internal.io.EventMonitor$*"),
+      exclude[MissingClassProblem]("sbt.internal.io.EventMonitor*"),
       exclude[DirectMissingMethodProblem]("sbt.internal.io.EventMonitor.legacy"),
       exclude[DirectMissingMethodProblem]("sbt.internal.io.EventMonitor.applyImpl"),