From 96b285edd457017e558a623147cfddd5fab7c90d Mon Sep 17 00:00:00 2001
From: Christopher Batey <christopher.batey@gmail.com>
Date: Mon, 30 Apr 2018 08:49:50 +0100
Subject: [PATCH] Upgrade to Scala 2.12.6 (#25001)

---
 .travis.yml                | 2 +-
 project/Dependencies.scala | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 797de65d16..a977255e7d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ language: scala
 sudo: false
 
 scala:
-  - "2.12.5"
+  - "2.12.6"
   - "2.11.12"
 
 jdk:
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index a8b68ad8a1..345bfb3f5f 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -21,7 +21,7 @@ object Dependencies {
   val aeronVersion = "1.7.0"
 
   val Versions = Seq(
-    crossScalaVersions := Seq("2.11.12", "2.12.5"),
+    crossScalaVersions := Seq("2.11.12", "2.12.6"),
     scalaVersion := System.getProperty("akka.build.scalaVersion", crossScalaVersions.value.head),
     scalaStmVersion := sys.props.get("akka.build.scalaStmVersion").getOrElse("0.8"),
     scalaCheckVersion := sys.props.get("akka.build.scalaCheckVersion").getOrElse(