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

Remove Scala 2.11 for Akka 2.6 (#26760)

Browse source 
* Remove Scala 2.11 for Akka 2.6

* Remove unused import

* Update akka-actor/src/main/scala-2.13/akka/compat/Future.scala

Co-Authored-By: chbatey <christopher.batey@gmail.com>

* Update akka-actor/src/main/scala-2.13/akka/compat/Future.scala

Co-Authored-By: chbatey <christopher.batey@gmail.com>

* Remove last few bits of 2.11
This commit is contained in:
Christopher Batey 2019-04-19 07:53:27 +01:00 • committed by GitHub
parent d6eb1f237c
commit 0ab7a96ae2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 202 additions and 1053 deletions
Download patch file Download diff file Expand all files Collapse all files

5
akka-remote/src/main/scala/akka/remote/serialization/DaemonMsgCreateSerializer.scala
View file

@ -33,8 +33,6 @@ private[akka] final class DaemonMsgCreateSerializer(val system: ExtendedActorSys
import ProtobufSerializer.deserializeActorRef
import Deploy.NoDispatcherGiven
private val scala212OrLater = !scala.util.Properties.versionNumberString.startsWith("2.11")
private lazy val serialization = SerializationExtension(system)
override val includeManifest: Boolean = false
@ -207,8 +205,7 @@ private[akka] final class DaemonMsgCreateSerializer(val system: ExtendedActorSys
"null"
} else {
val className = m.getClass.getName
if (scala212OrLater && m.isInstanceOf[java.io.Serializable] && m.getClass.isSynthetic && className.contains(
"$Lambda$")) {
if (m.isInstanceOf[java.io.Serializable] && m.getClass.isSynthetic && className.contains("$Lambda$")) {
// When the additional-protobuf serializers are not enabled
// the serialization of the parameters is based on passing class name instead of
// serializerId and manifest as we usually do. With Scala 2.12 the functions are generated as