From 650f0b087ba2691aeeb13570035bb7d327c12c5d Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Wed, 19 Oct 2016 08:20:48 +1100 Subject: [PATCH 1/4] Bump to Scala 2.12.0-RC2 Performed with: git grep -l 2.12.0-RC1 | xargs perl -p -i -e 's/2.12.0-RC1/2.12.0-RC2/' --- .travis.yml | 4 ++-- project/Build.scala | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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/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" } }, From 0b7e0816e95321ea99e3c1370c1622e4ce943836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Mickevi=C4=8Dius?= Date: Wed, 19 Oct 2016 11:01:57 +0300 Subject: [PATCH 2/4] Patch for latest scala --- .../test/resources/patches/{2.12.0-RC1.patch => 2.12.0-RC2.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename plugin/src/test/resources/patches/{2.12.0-RC1.patch => 2.12.0-RC2.patch} (100%) 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 From 16ae973b9a606928813007c25ba3e8ac301d5ef3 Mon Sep 17 00:00:00 2001 From: Konrad Malawski Date: Mon, 4 Jul 2016 12:18:23 +0200 Subject: [PATCH 3/4] +add some more maintainer info to readme --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e9b2781..382478e 100644 --- a/README.md +++ b/README.md @@ -145,4 +145,8 @@ This software is licensed under the Apache 2 license. ### Sponsored by Lightbend -Responsible: Dr. Roland Kuhn +Responsible: Dr. Roland Kuhn (@rkuhn) +Maintained mostly by @akka team (@2m, @ktoso) + +Feel free to ping above maintainers for code review or discussions. +Pull requests are very welcome–thanks in advance! From d87d03231d17ad42b94514d4db89a832246d07bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Mickevi=C4=8Dius?= Date: Wed, 19 Oct 2016 11:12:05 +0300 Subject: [PATCH 4/4] Fix links to maintainers --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 382478e..e187112 100644 --- a/README.md +++ b/README.md @@ -145,8 +145,9 @@ This software is licensed under the Apache 2 license. ### Sponsored by Lightbend -Responsible: Dr. Roland Kuhn (@rkuhn) -Maintained mostly by @akka team (@2m, @ktoso) +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!