raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Update to Scala 2.12.10 (#27734)

Browse source
This commit is contained in:
Arnout Engelen 2019-09-30 16:22:13 +02:00 • committed by GitHub
parent 9b8c72fadd
commit 3b17c01c68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-actor/src/main/scala-2.13-/akka/util/ByteString.scala
View file

@ -389,7 +389,7 @@ object ByteString {
private[akka] object ByteStrings extends Companion { private[akka] object ByteStrings extends Companion {
def apply(bytestrings: Vector[ByteString1]): ByteString = 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) def apply(bytestrings: Vector[ByteString1], length: Int): ByteString = new ByteStrings(bytestrings, length)

2
project/Dependencies.scala
View file

@ -26,7 +26,7 @@ object Dependencies {
val protobufJavaVersion = "3.9.2" val protobufJavaVersion = "3.9.2"
val logbackVersion = "1.2.3" val logbackVersion = "1.2.3"
val scala212Version = "2.12.9" val scala212Version = "2.12.10"
val scala213Version = "2.13.0" val scala213Version = "2.13.0"
val reactiveStreamsVersion = "1.0.3" val reactiveStreamsVersion = "1.0.3"

2
project/Doc.scala
View file

@ -177,7 +177,7 @@ object BootstrapGenjavadoc extends AutoPlugin {
override lazy val projectSettings = UnidocRoot.CliOptions.genjavadocEnabled override lazy val projectSettings = UnidocRoot.CliOptions.genjavadocEnabled
.ifTrue(Seq( .ifTrue(Seq(
unidocGenjavadocVersion := "0.13", unidocGenjavadocVersion := "0.14",
scalacOptions in Compile ++= Seq("-P:genjavadoc:fabricateParams=true", "-P:genjavadoc:suppressSynthetic=false"))) scalacOptions in Compile ++= Seq("-P:genjavadoc:fabricateParams=true", "-P:genjavadoc:suppressSynthetic=false")))
.getOrElse(Nil) .getOrElse(Nil)
} }