Skip to content

Remove use of scala.concurrent.forkjoin #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 14, 2018
Merged

Remove use of scala.concurrent.forkjoin #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}

Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/scala/async/run/futures/FutureSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
})
Expand Down