aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth Tisue <seth@tisue.net>2018-02-06 11:04:12 -0800
committerSeth Tisue <seth@tisue.net>2018-02-06 15:02:36 -0800
commit49e9f96b6aa8bff9ea46eefb7fc907eb84f41afd (patch)
tree5ad15df9d385f61e9cf83a9461a9ef0efa6f0ae7
parent1474bc8bbee8ca58c12b1353e731fb912689a619 (diff)
downloadscala-async-49e9f96b6aa8bff9ea46eefb7fc907eb84f41afd.tar.gz
scala-async-49e9f96b6aa8bff9ea46eefb7fc907eb84f41afd.tar.bz2
scala-async-49e9f96b6aa8bff9ea46eefb7fc907eb84f41afd.zip
bump version numbers of multiple things
most notably Scala 2.13.0-M3
-rw-r--r--README.md21
-rw-r--r--build.sbt12
-rw-r--r--project/build.properties2
-rw-r--r--project/plugins.sbt2
4 files changed, 20 insertions, 17 deletions
diff --git a/README.md b/README.md
index 56b8ab5..a0b4e57 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,10 @@
-# scala-async [<img src="https://img.shields.io/travis/scala/async.svg"/>](https://travis-ci.org/scala/async) [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-async_2.10.svg?label=latest%20release%20for%202.10"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-async_2.10) [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-async_2.11.svg?label=latest%20release%20for%202.11"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-async_2.11) [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-async_2.12.svg?label=latest%20release%20for%202.12"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-async_2.12)
+# scala-async [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-async_2.11.svg?label=latest%20release%20for%202.11"/>](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-async_2.11) [<img src="https://img.shields.io/maven-central/v/org.scala-lang.modules/scala-async_2.12.svg?label=latest%20release%20for%202.12"/>](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 <dependencies> (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 <dependencies> (make sure to use the correct Scala version suffix
+to match your project’s Scala binary version):
```scala
<dependency>
<groupId>org.scala-lang.modules</groupId>
- <artifactId>scala-async_2.11</artifactId>
- <version>0.9.6</version>
+ <artifactId>scala-async_2.12</artifactId>
+ <version>0.9.7</version>
</dependency>
```
-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 782c4d7..9fe9cae 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 c091b86..133a8f1 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 097aacc..314c55a 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")