Scala 2.13.0 -> Scala 2.13.1 (#28140)

* Scala 2.13.0 -> Scala 2.13.1

* Update to genjavadoc 0.15

* Allow 'higherKinds' without explicit import

To follow the 2.13.1 convention

* Remaining higherKinds imports

* Mima excludes for missing value classes in generics

.travis.yml

@@ -4,7 +4,7 @@ sudo: false
 
 scala:
   - "2.12.9"
-  - "2.13.0"
+  - "2.13.1"
 
 before_install: curl -Ls https://git.io/jabba | bash && . ~/.jabba/jabba.sh
 install: jabba install "adopt@~1.$TRAVIS_JDK.0-0" && jabba use "$_" && java -Xmx32m -version

akka-actor-typed/src/main/mima-filters/2.6.0.backwards.excludes/28140-scala-2.13.1.backwards.excludes

@@ -0,0 +1,4 @@
+# The value class 'OptionVal' was dropped from the signature in 2.13.1.
+# That's fine since it's internal and shouldn't have a run-time effect anyway.
+ProblemFilters.exclude[IncompatibleSignatureProblem]("akka.actor.typed.javadsl.ReceiveBuilder#Case.unapply")
+ProblemFilters.exclude[IncompatibleSignatureProblem]("akka.actor.typed.javadsl.BehaviorBuilder#Case.unapply")

akka-actor/src/main/scala/akka/util/TypedMultiMap.scala

@@ -4,8 +4,6 @@
 
 package akka.util
 
-import language.higherKinds
-
 /**
  * An immutable multi-map that expresses the value type as a type function of the key
  * type. Create it with a type constructor that expresses the relationship:

akka-cluster-typed/src/main/mima-filters/2.6.0.backwards.excludes/28140-scala-2.13.1.backwards.excludes

@@ -0,0 +1,3 @@
+# The 'ServiceRegistry' value class was dropped from the signature in 2.13.1.
+# That's fine since it's internal and shouldn't have a run-time effect anyway.
+ProblemFilters.exclude[IncompatibleSignatureProblem]("akka.cluster.typed.internal.receptionist.ShardedServiceRegistry.*")

akka-stream/src/main/scala/akka/stream/impl/SubFlowImpl.scala

@@ -9,8 +9,6 @@ import akka.annotation.InternalApi
 import akka.stream._
 import akka.stream.scaladsl._
 
-import language.higherKinds
-
 /**
  * INTERNAL API
  */

akka-stream/src/main/scala/akka/stream/scaladsl/Flow.scala

@@ -26,7 +26,6 @@ import scala.annotation.unchecked.uncheckedVariance
 import scala.collection.immutable
 import scala.concurrent.Future
 import scala.concurrent.duration.FiniteDuration
-import scala.language.higherKinds
 import akka.stream.impl.fusing.FlattenMerge
 import akka.NotUsed
 import akka.actor.ActorRef

akka-stream/src/main/scala/akka/stream/scaladsl/FlowWithContextOps.scala

@@ -6,7 +6,6 @@ package akka.stream.scaladsl
 
 import scala.collection.immutable
 import scala.concurrent.Future
-import scala.language.higherKinds
 import scala.annotation.unchecked.uncheckedVariance
 import akka.NotUsed
 import akka.dispatch.ExecutionContexts

akka-stream/src/main/scala/akka/stream/scaladsl/SubFlow.scala

@@ -5,7 +5,6 @@
 package akka.stream.scaladsl
 
 import akka.stream._
-import language.higherKinds
 import scala.annotation.unchecked.uncheckedVariance
 
 /**

project/AkkaBuild.scala

@@ -121,7 +121,13 @@ object AkkaBuild {
 
   private def allWarnings: Boolean = System.getProperty("akka.allwarnings", "false").toBoolean
 
-  final val DefaultScalacOptions = Seq("-encoding", "UTF-8", "-feature", "-unchecked", "-Xlog-reflective-calls")
+  final val DefaultScalacOptions = Seq(
+    "-encoding", "UTF-8",
+    "-feature",
+    "-unchecked",
+    "-Xlog-reflective-calls",
+    // 'blessed' since 2.13.1
+    "-language:higherKinds")
 
   // -XDignore.symbol.file suppresses sun.misc.Unsafe warnings
   final val DefaultJavacOptions = Seq("-encoding", "UTF-8", "-Xlint:unchecked", "-XDignore.symbol.file")

project/Dependencies.scala

@@ -27,7 +27,7 @@ object Dependencies {
   val logbackVersion = "1.2.3"
 
   val scala212Version = "2.12.10"
-  val scala213Version = "2.13.0"
+  val scala213Version = "2.13.1"
 
   val reactiveStreamsVersion = "1.0.3"
 

project/Doc.scala

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