diff --git a/LICENSE b/LICENSE
index 836bf3d8..499a1aa4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
-Copyright (C) 2012-2014 EPFL
-Copyright (C) 2012-2014 Typesafe, Inc.
+Copyright (C) 2012-2018 EPFL
+Copyright (C) 2012-2018 Lightbend, Inc.
All rights reserved.
diff --git a/README.md b/README.md
index 56b8ab5e..a0b4e571 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,10 @@
-# scala-async [
](https://travis-ci.org/scala/async) [
](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-async_2.10) [
](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-async_2.11) [
](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-async_2.12)
+# scala-async [](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-async_2.11) [](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-async_2.12)
-Note: this branch targets Scala 2.11.x, support for Scala 2.10.x has been moved to [this branch](https://github.com/scala/async/tree/2.10.x).
+## Supported Scala versions
+
+This branch targets Scala 2.11, 2.12, and 2.13.
+
+Support for Scala 2.10 is [on a branch](https://github.com/scala/async/tree/2.10.x).
## Quick start
@@ -8,22 +12,20 @@ To include scala-async in an existing project use the library published on Maven
For sbt projects add the following to your build definition - build.sbt or project/Build.scala:
```scala
-libraryDependencies += "org.scala-lang.modules" %% "scala-async" % "0.9.6"
+libraryDependencies += "org.scala-lang.modules" %% "scala-async" % "0.9.7"
```
-For Maven projects add the following to your (make sure to use the correct Scala version prefix, _2.10 or _2.11,
-to match your project’s Scala version):
+For Maven projects add the following to your (make sure to use the correct Scala version suffix
+to match your project’s Scala binary version):
```scala
org.scala-lang.modules
- scala-async_2.11
- 0.9.6
+ scala-async_2.12
+ 0.9.7
```
-Scala 2.12 support is introduced in 0.9.6-RC5.
-
After adding a scala-async to your classpath, write your first `async` block:
```scala
@@ -155,6 +157,7 @@ difficult to understand.
- an `apply(): Unit` method that starts the computation.
## Limitations
+
- See the [neg](https://github.com/scala/async/tree/master/src/test/scala/scala/async/neg) test cases
for constructs that are not allowed in an `async` block.
- See the [issue list](https://github.com/scala/async/issues?state=open) for which of these restrictions are planned
diff --git a/build.sbt b/build.sbt
index 782c4d7d..9fe9caea 100644
--- a/build.sbt
+++ b/build.sbt
@@ -3,9 +3,9 @@ import ScalaModulePlugin._
scalaModuleSettings
scalaVersionsByJvm in ThisBuild := {
- val v211 = "2.11.11"
- val v212 = "2.12.3"
- val v213 = "2.13.0-M2"
+ val v211 = "2.11.12"
+ val v212 = "2.12.4"
+ val v213 = "2.13.0-M3"
Map(
6 -> List(v211 -> true),
@@ -17,12 +17,12 @@ scalaVersionsByJvm in ThisBuild := {
name := "scala-async"
repoName := "async"
-version := "0.9.7-SNAPSHOT"
+version := "0.9.8-SNAPSHOT"
libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided"
libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value % "test" // for ToolBox
-libraryDependencies += "junit" % "junit-dep" % "4.10" % "test"
-libraryDependencies += "com.novocode" % "junit-interface" % "0.10" % "test"
+libraryDependencies += "junit" % "junit" % "4.12" % "test"
+libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test"
enableOptimizer
testOptions += Tests.Argument(TestFrameworks.JUnit, "-q", "-v", "-s")
diff --git a/project/build.properties b/project/build.properties
index c091b86c..133a8f19 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.16
+sbt.version=0.13.17
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 097aacc4..314c55af 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.12")
+addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.13")
diff --git a/src/main/scala/scala/async/Async.scala b/src/main/scala/scala/async/Async.scala
index e9cd6c48..0cae2460 100644
--- a/src/main/scala/scala/async/Async.scala
+++ b/src/main/scala/scala/async/Async.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async
diff --git a/src/main/scala/scala/async/internal/AnfTransform.scala b/src/main/scala/scala/async/internal/AnfTransform.scala
index 00855549..bb63d565 100644
--- a/src/main/scala/scala/async/internal/AnfTransform.scala
+++ b/src/main/scala/scala/async/internal/AnfTransform.scala
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async.internal
diff --git a/src/main/scala/scala/async/internal/AsyncAnalysis.scala b/src/main/scala/scala/async/internal/AsyncAnalysis.scala
index 14705926..990db742 100644
--- a/src/main/scala/scala/async/internal/AsyncAnalysis.scala
+++ b/src/main/scala/scala/async/internal/AsyncAnalysis.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async.internal
diff --git a/src/main/scala/scala/async/internal/AsyncBase.scala b/src/main/scala/scala/async/internal/AsyncBase.scala
index c883986f..ee5c9354 100644
--- a/src/main/scala/scala/async/internal/AsyncBase.scala
+++ b/src/main/scala/scala/async/internal/AsyncBase.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async.internal
diff --git a/src/main/scala/scala/async/internal/AsyncId.scala b/src/main/scala/scala/async/internal/AsyncId.scala
index 86d97486..8c747d07 100644
--- a/src/main/scala/scala/async/internal/AsyncId.scala
+++ b/src/main/scala/scala/async/internal/AsyncId.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async.internal
diff --git a/src/main/scala/scala/async/internal/AsyncUtils.scala b/src/main/scala/scala/async/internal/AsyncUtils.scala
index 385cde4a..416bd441 100644
--- a/src/main/scala/scala/async/internal/AsyncUtils.scala
+++ b/src/main/scala/scala/async/internal/AsyncUtils.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async.internal
diff --git a/src/main/scala/scala/async/internal/ExprBuilder.scala b/src/main/scala/scala/async/internal/ExprBuilder.scala
index 86d54229..e1ab6c86 100644
--- a/src/main/scala/scala/async/internal/ExprBuilder.scala
+++ b/src/main/scala/scala/async/internal/ExprBuilder.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async.internal
diff --git a/src/main/scala/scala/async/internal/FutureSystem.scala b/src/main/scala/scala/async/internal/FutureSystem.scala
index c1d72f2e..3ca9c834 100644
--- a/src/main/scala/scala/async/internal/FutureSystem.scala
+++ b/src/main/scala/scala/async/internal/FutureSystem.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async.internal
diff --git a/src/main/scala/scala/async/internal/StateAssigner.scala b/src/main/scala/scala/async/internal/StateAssigner.scala
index 2b74e8dc..1c4a2534 100644
--- a/src/main/scala/scala/async/internal/StateAssigner.scala
+++ b/src/main/scala/scala/async/internal/StateAssigner.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async.internal
diff --git a/src/main/scala/scala/async/internal/TransformUtils.scala b/src/main/scala/scala/async/internal/TransformUtils.scala
index 98f84dd3..016ffc15 100644
--- a/src/main/scala/scala/async/internal/TransformUtils.scala
+++ b/src/main/scala/scala/async/internal/TransformUtils.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async.internal
diff --git a/src/test/scala/scala/async/TestLatch.scala b/src/test/scala/scala/async/TestLatch.scala
index 5b771d8f..ece17d1a 100644
--- a/src/test/scala/scala/async/TestLatch.scala
+++ b/src/test/scala/scala/async/TestLatch.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async
diff --git a/src/test/scala/scala/async/TreeInterrogation.scala b/src/test/scala/scala/async/TreeInterrogation.scala
index d2e85138..9426d1dc 100644
--- a/src/test/scala/scala/async/TreeInterrogation.scala
+++ b/src/test/scala/scala/async/TreeInterrogation.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async
diff --git a/src/test/scala/scala/async/neg/LocalClasses0Spec.scala b/src/test/scala/scala/async/neg/LocalClasses0Spec.scala
index 240e0889..fd261b59 100644
--- a/src/test/scala/scala/async/neg/LocalClasses0Spec.scala
+++ b/src/test/scala/scala/async/neg/LocalClasses0Spec.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async
diff --git a/src/test/scala/scala/async/neg/NakedAwait.scala b/src/test/scala/scala/async/neg/NakedAwait.scala
index 2af691ff..ba2f23a6 100644
--- a/src/test/scala/scala/async/neg/NakedAwait.scala
+++ b/src/test/scala/scala/async/neg/NakedAwait.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async
diff --git a/src/test/scala/scala/async/neg/SampleNegSpec.scala b/src/test/scala/scala/async/neg/SampleNegSpec.scala
index 438003d1..5c36af18 100644
--- a/src/test/scala/scala/async/neg/SampleNegSpec.scala
+++ b/src/test/scala/scala/async/neg/SampleNegSpec.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async
diff --git a/src/test/scala/scala/async/package.scala b/src/test/scala/scala/async/package.scala
index a25eb04d..5c4e9431 100644
--- a/src/test/scala/scala/async/package.scala
+++ b/src/test/scala/scala/async/package.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala
diff --git a/src/test/scala/scala/async/run/WarningsSpec.scala b/src/test/scala/scala/async/run/WarningsSpec.scala
index c76168e5..9c55af42 100644
--- a/src/test/scala/scala/async/run/WarningsSpec.scala
+++ b/src/test/scala/scala/async/run/WarningsSpec.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async
diff --git a/src/test/scala/scala/async/run/anf/AnfTransformSpec.scala b/src/test/scala/scala/async/run/anf/AnfTransformSpec.scala
index 29b7c1d0..0705f3e7 100644
--- a/src/test/scala/scala/async/run/anf/AnfTransformSpec.scala
+++ b/src/test/scala/scala/async/run/anf/AnfTransformSpec.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async
diff --git a/src/test/scala/scala/async/run/await0/Await0Spec.scala b/src/test/scala/scala/async/run/await0/Await0Spec.scala
index 61978fb0..7cc4095f 100644
--- a/src/test/scala/scala/async/run/await0/Await0Spec.scala
+++ b/src/test/scala/scala/async/run/await0/Await0Spec.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async
@@ -7,7 +7,7 @@ package run
package await0
/**
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
import language.{reflectiveCalls, postfixOps}
diff --git a/src/test/scala/scala/async/run/block0/AsyncSpec.scala b/src/test/scala/scala/async/run/block0/AsyncSpec.scala
index 1d108589..a12b23f7 100644
--- a/src/test/scala/scala/async/run/block0/AsyncSpec.scala
+++ b/src/test/scala/scala/async/run/block0/AsyncSpec.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async
diff --git a/src/test/scala/scala/async/run/block1/block1.scala b/src/test/scala/scala/async/run/block1/block1.scala
index 4f70a36f..53001680 100644
--- a/src/test/scala/scala/async/run/block1/block1.scala
+++ b/src/test/scala/scala/async/run/block1/block1.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async
diff --git a/src/test/scala/scala/async/run/exceptions/ExceptionsSpec.scala b/src/test/scala/scala/async/run/exceptions/ExceptionsSpec.scala
index 57d53e4e..d66c5ed5 100644
--- a/src/test/scala/scala/async/run/exceptions/ExceptionsSpec.scala
+++ b/src/test/scala/scala/async/run/exceptions/ExceptionsSpec.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async
diff --git a/src/test/scala/scala/async/run/futures/FutureSpec.scala b/src/test/scala/scala/async/run/futures/FutureSpec.scala
index 362303e9..34c8a21e 100644
--- a/src/test/scala/scala/async/run/futures/FutureSpec.scala
+++ b/src/test/scala/scala/async/run/futures/FutureSpec.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async
diff --git a/src/test/scala/scala/async/run/hygiene/Hygiene.scala b/src/test/scala/scala/async/run/hygiene/Hygiene.scala
index ba1557dc..541611eb 100644
--- a/src/test/scala/scala/async/run/hygiene/Hygiene.scala
+++ b/src/test/scala/scala/async/run/hygiene/Hygiene.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async
diff --git a/src/test/scala/scala/async/run/ifelse0/IfElse0.scala b/src/test/scala/scala/async/run/ifelse0/IfElse0.scala
index 2ecfbdba..922c462c 100644
--- a/src/test/scala/scala/async/run/ifelse0/IfElse0.scala
+++ b/src/test/scala/scala/async/run/ifelse0/IfElse0.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async
diff --git a/src/test/scala/scala/async/run/ifelse0/WhileSpec.scala b/src/test/scala/scala/async/run/ifelse0/WhileSpec.scala
index 24dc50a7..9ba0b694 100644
--- a/src/test/scala/scala/async/run/ifelse0/WhileSpec.scala
+++ b/src/test/scala/scala/async/run/ifelse0/WhileSpec.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async
diff --git a/src/test/scala/scala/async/run/ifelse1/IfElse1.scala b/src/test/scala/scala/async/run/ifelse1/IfElse1.scala
index 6cbe9109..46fb57da 100644
--- a/src/test/scala/scala/async/run/ifelse1/IfElse1.scala
+++ b/src/test/scala/scala/async/run/ifelse1/IfElse1.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async
diff --git a/src/test/scala/scala/async/run/ifelse2/ifelse2.scala b/src/test/scala/scala/async/run/ifelse2/ifelse2.scala
index d40b48d5..c9980241 100644
--- a/src/test/scala/scala/async/run/ifelse2/ifelse2.scala
+++ b/src/test/scala/scala/async/run/ifelse2/ifelse2.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async
diff --git a/src/test/scala/scala/async/run/ifelse3/IfElse3.scala b/src/test/scala/scala/async/run/ifelse3/IfElse3.scala
index 24ddf08e..bbae55cf 100644
--- a/src/test/scala/scala/async/run/ifelse3/IfElse3.scala
+++ b/src/test/scala/scala/async/run/ifelse3/IfElse3.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async
diff --git a/src/test/scala/scala/async/run/ifelse4/IfElse4.scala b/src/test/scala/scala/async/run/ifelse4/IfElse4.scala
index 7c654212..6a98ff4e 100644
--- a/src/test/scala/scala/async/run/ifelse4/IfElse4.scala
+++ b/src/test/scala/scala/async/run/ifelse4/IfElse4.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async
diff --git a/src/test/scala/scala/async/run/lazyval/LazyValSpec.scala b/src/test/scala/scala/async/run/lazyval/LazyValSpec.scala
index 701d5d6c..c91508e2 100644
--- a/src/test/scala/scala/async/run/lazyval/LazyValSpec.scala
+++ b/src/test/scala/scala/async/run/lazyval/LazyValSpec.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async
diff --git a/src/test/scala/scala/async/run/live/LiveVariablesSpec.scala b/src/test/scala/scala/async/run/live/LiveVariablesSpec.scala
index af236aa9..5497b07a 100644
--- a/src/test/scala/scala/async/run/live/LiveVariablesSpec.scala
+++ b/src/test/scala/scala/async/run/live/LiveVariablesSpec.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014-2013 Typesafe Inc.
+ * Copyright (C) 2012-2014-2013 Lightbend Inc.
*/
package scala.async
diff --git a/src/test/scala/scala/async/run/match0/Match0.scala b/src/test/scala/scala/async/run/match0/Match0.scala
index c5138ad6..7c553c66 100644
--- a/src/test/scala/scala/async/run/match0/Match0.scala
+++ b/src/test/scala/scala/async/run/match0/Match0.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async
diff --git a/src/test/scala/scala/async/run/noawait/NoAwaitSpec.scala b/src/test/scala/scala/async/run/noawait/NoAwaitSpec.scala
index 8bf480bc..669eee2c 100644
--- a/src/test/scala/scala/async/run/noawait/NoAwaitSpec.scala
+++ b/src/test/scala/scala/async/run/noawait/NoAwaitSpec.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async
diff --git a/src/test/scala/scala/async/run/stackoverflow/StackOverflowSpec.scala b/src/test/scala/scala/async/run/stackoverflow/StackOverflowSpec.scala
index 2dc9b92b..c0850d64 100644
--- a/src/test/scala/scala/async/run/stackoverflow/StackOverflowSpec.scala
+++ b/src/test/scala/scala/async/run/stackoverflow/StackOverflowSpec.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async
diff --git a/src/test/scala/scala/async/run/toughtype/ToughType.scala b/src/test/scala/scala/async/run/toughtype/ToughType.scala
index 33c839e9..2bf912bd 100644
--- a/src/test/scala/scala/async/run/toughtype/ToughType.scala
+++ b/src/test/scala/scala/async/run/toughtype/ToughType.scala
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012-2014 Typesafe Inc.
+ * Copyright (C) 2012-2014 Lightbend Inc.
*/
package scala.async