From 6f337f23b150d3059124bb08bf1b2e91da50dd2e Mon Sep 17 00:00:00 2001 From: Daniil Smirnov Date: Fri, 1 Jul 2016 15:29:38 +0300 Subject: [PATCH 1/2] Remove `discontinue` notice from readme. --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1ce55ee..1a02a1f 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,8 @@ scala-continuations [](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. From cf33bfe065d1eb05dcad012d10b008743cce8c14 Mon Sep 17 00:00:00 2001 From: Daniil Smirnov Date: Fri, 1 Jul 2016 15:34:46 +0300 Subject: [PATCH 2/2] Test agains scala 2.12.0-M5 --- .travis.yml | 5 +++-- build.sbt | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8e79a36..f1dc3a3 100644 --- a/.travis.yml +++ b/.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: - adriaan.moors@typesafe.com + - danslapman@gmail.com diff --git a/build.sbt b/build.sbt index 8df0854..fb7d5dd 100644 --- a/build.sbt +++ b/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",