Merge pull request #13 from danslapman/master

Test against Scala 2.12.0-M5

Author: danslapman

.travis.yml

@@ -15,14 +15,15 @@ script:
   - admin/build.sh
 scala:
   - 2.11.8
-  - 2.12.0-M4
+  - 2.12.0-M5
 jdk:
   - openjdk6
   - oraclejdk8
 matrix:
   exclude:
-    - scala: 2.12.0-M4
+    - scala: 2.12.0-M5
       jdk: openjdk6
 notifications:
   email:
     - [email protected]
+    - [email protected]

README.md

@@ -1,9 +1,8 @@
 scala-continuations  [<img src="https://api.travis-ci.org/scala/scala-continuations.png"/>](https://travis-ci.org/scala/scala-continuations)
 =========
 
-Maintained by @danslapman. 
+scala-continuations is a library and a compiler plugin for Scala language that provides support for CPS transformations.
 
-You may also be interested in https://github.com/scala/async, which covers the most common use case for the continuations plugin.
+This library is community-maintained. The lead maintainer is [@danslapman](https://github.com/danslapman). 
 
-The Scala Delimited Continuations Plugin and Library will continue to ship with Scala 2.11.0.
-However, it will no longer be included with Scala 2.12.
+You may also be interested in https://github.com/scala/async, which covers the most common use case for the continuations plugin.

build.sbt

@@ -9,7 +9,7 @@ lazy val commonSettings = scalaModuleSettings ++ Seq(
   organization               := "org.scala-lang.plugins",
   version                    := "1.0.3-SNAPSHOT",
   scalaVersion               := "2.11.8",
-  crossScalaVersions         := Seq("2.11.8", "2.12.0-M4"),
+  crossScalaVersions         := Seq("2.11.8", "2.12.0-M5"),
   snapshotScalaBinaryVersion := "2.11.8",
   scalacOptions ++= Seq(
     "-deprecation",