diff options
| author | Seth Tisue <seth@tisue.net> | 2018-03-14 08:16:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-14 08:16:18 -0700 |
| commit | e7f89483f686d2232cd8e58248d42e529fb7b9a6 (patch) | |
| tree | 2407ed21ed6ace8ae9658d90bdcc91a91da97b3e | |
| parent | 7d5ebe62336ab99a5988d4ef472fd486ec6cbe49 (diff) | |
| parent | 1a7972ff87d6bd0ab30cc2a98cdd8f94cb9239f9 (diff) | |
| download | scala-async-e7f89483f686d2232cd8e58248d42e529fb7b9a6.tar.gz scala-async-e7f89483f686d2232cd8e58248d42e529fb7b9a6.tar.bz2 scala-async-e7f89483f686d2232cd8e58248d42e529fb7b9a6.zip | |
Merge pull request #192 from NthPortal/forkjoin-fix
Remove use of scala.concurrent.forkjoin
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | build.sbt | 3 | ||||
| -rw-r--r-- | src/test/scala/scala/async/run/futures/FutureSpec.scala | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 6837a1a..7a95e00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,12 +10,7 @@ env: - secure: "Cj4PsumsWL37Pl7V5ZPJw+/xH9esHblG5nN9Op91XcCfG006xHsz2w1iNOqFqCF8wAhgObuA2CmAH3ZuI1jZGGSo2HMt9+f5Z6tpifFzsTHZJtdNIVOpS3/NGhvgtg3UnT5WQQtnVi6zlkKl1xCpAIDNhOJ9dXoL54auAqvxpko=" script: - admin/build.sh -addons: - apt: - packages: - - openjdk-6-jdk jdk: - - openjdk6 - oraclejdk8 notifications: email: @@ -8,9 +8,8 @@ scalaVersionsByJvm in ThisBuild := { val v213 = "2.13.0-M3" Map( - 6 -> List(v211 -> true), 7 -> List(v211 -> false), - 8 -> List(v212 -> true, v213 -> true, v211 -> false), + 8 -> List(v212 -> true, v213 -> true, v211 -> true), 9 -> List(v212 -> false, v213 -> false, v211 -> false)) } diff --git a/src/test/scala/scala/async/run/futures/FutureSpec.scala b/src/test/scala/scala/async/run/futures/FutureSpec.scala index 3f3f726..eb57ff5 100644 --- a/src/test/scala/scala/async/run/futures/FutureSpec.scala +++ b/src/test/scala/scala/async/run/futures/FutureSpec.scala @@ -35,7 +35,7 @@ class FutureSpec { @Test def `A future with custom ExecutionContext should handle Throwables`() { val ms = new mutable.HashSet[Throwable] with mutable.SynchronizedSet[Throwable] - implicit val ec = scala.concurrent.ExecutionContext.fromExecutor(new scala.concurrent.forkjoin.ForkJoinPool(), { + implicit val ec = scala.concurrent.ExecutionContext.fromExecutor(new java.util.concurrent.ForkJoinPool(), { t => ms += t }) |