From 3b17c01c6856abe2ff741520ec295afe81195c50 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Mon, 30 Sep 2019 16:22:13 +0200 Subject: [PATCH] Update to Scala 2.12.10 (#27734) --- akka-actor/src/main/scala-2.13-/akka/util/ByteString.scala | 2 +- project/Dependencies.scala | 2 +- project/Doc.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/akka-actor/src/main/scala-2.13-/akka/util/ByteString.scala b/akka-actor/src/main/scala-2.13-/akka/util/ByteString.scala index 87c8007e07..0256efd7ac 100644 --- a/akka-actor/src/main/scala-2.13-/akka/util/ByteString.scala +++ b/akka-actor/src/main/scala-2.13-/akka/util/ByteString.scala @@ -389,7 +389,7 @@ object ByteString { private[akka] object ByteStrings extends Companion { def apply(bytestrings: Vector[ByteString1]): ByteString = - new ByteStrings(bytestrings, (0 /: bytestrings)(_ + _.length)) + new ByteStrings(bytestrings, bytestrings.foldLeft(0)(_ + _.length)) def apply(bytestrings: Vector[ByteString1], length: Int): ByteString = new ByteStrings(bytestrings, length) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index efa5e709cf..a52514b955 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -26,7 +26,7 @@ object Dependencies { val protobufJavaVersion = "3.9.2" val logbackVersion = "1.2.3" - val scala212Version = "2.12.9" + val scala212Version = "2.12.10" val scala213Version = "2.13.0" val reactiveStreamsVersion = "1.0.3" diff --git a/project/Doc.scala b/project/Doc.scala index 466dd42229..30198115af 100644 --- a/project/Doc.scala +++ b/project/Doc.scala @@ -177,7 +177,7 @@ object BootstrapGenjavadoc extends AutoPlugin { override lazy val projectSettings = UnidocRoot.CliOptions.genjavadocEnabled .ifTrue(Seq( - unidocGenjavadocVersion := "0.13", + unidocGenjavadocVersion := "0.14", scalacOptions in Compile ++= Seq("-P:genjavadoc:fabricateParams=true", "-P:genjavadoc:suppressSynthetic=false"))) .getOrElse(Nil) }