diff --git a/.travis.yml b/.travis.yml index 019642b..8b4f918 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,13 +28,13 @@ env: - SCALA_VERSION=2.11.6 - SCALA_VERSION=2.11.7 - SCALA_VERSION=2.11.8 - - SCALA_VERSION=2.12.0-RC1 + - SCALA_VERSION=2.12.0-RC2 matrix: exclude: # scala 2.12.x requires jdk8 - jdk: openjdk6 - env: SCALA_VERSION=2.12.0-RC1 + env: SCALA_VERSION=2.12.0-RC2 # Increasing ReservedCodeCacheSize minimizes scala compiler-interface compile times script: diff --git a/README.md b/README.md index e9b2781..e187112 100644 --- a/README.md +++ b/README.md @@ -145,4 +145,9 @@ This software is licensed under the Apache 2 license. ### Sponsored by Lightbend -Responsible: Dr. Roland Kuhn +Responsible: Dr. Roland Kuhn ([@rkuhn](https://github.com/rkuhn)) + +Maintained by [Akka Team](https://github.com/orgs/akka/teams/akka-team) (mostly by [@2m](https://github.com/2m), [@ktoso](https://github.com/ktoso)) + +Feel free to ping above maintainers for code review or discussions. +Pull requests are very welcome–thanks in advance! diff --git a/plugin/src/test/resources/patches/2.12.0-RC1.patch b/plugin/src/test/resources/patches/2.12.0-RC2.patch similarity index 100% rename from plugin/src/test/resources/patches/2.12.0-RC1.patch rename to plugin/src/test/resources/patches/2.12.0-RC2.patch diff --git a/project/Build.scala b/project/Build.scala index 7aff253..73ae101 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -32,7 +32,7 @@ object B extends Build { }, scalaTestVersion := { scalaVersion.value match { - case "2.12.0-RC1" => "3.0.0" + case "2.12.0-RC2" => "3.0.0" case _ => "2.1.3" } },