diff --git a/.travis.yml b/.travis.yml index b82a5d7532..b579fd83e5 100644 --- a/.travis.yml +++ b/.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 diff --git a/akka-actor-typed/src/main/mima-filters/2.6.0.backwards.excludes/28140-scala-2.13.1.backwards.excludes b/akka-actor-typed/src/main/mima-filters/2.6.0.backwards.excludes/28140-scala-2.13.1.backwards.excludes new file mode 100644 index 0000000000..be749303be --- /dev/null +++ b/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") diff --git a/akka-actor/src/main/scala/akka/util/TypedMultiMap.scala b/akka-actor/src/main/scala/akka/util/TypedMultiMap.scala index 278275c330..a8f2fa49cf 100644 --- a/akka-actor/src/main/scala/akka/util/TypedMultiMap.scala +++ b/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: diff --git a/akka-cluster-typed/src/main/mima-filters/2.6.0.backwards.excludes/28140-scala-2.13.1.backwards.excludes b/akka-cluster-typed/src/main/mima-filters/2.6.0.backwards.excludes/28140-scala-2.13.1.backwards.excludes new file mode 100644 index 0000000000..6d7b311310 --- /dev/null +++ b/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.*") diff --git a/akka-stream/src/main/scala/akka/stream/impl/SubFlowImpl.scala b/akka-stream/src/main/scala/akka/stream/impl/SubFlowImpl.scala index 6f75da9bb9..b3f5bf723e 100644 --- a/akka-stream/src/main/scala/akka/stream/impl/SubFlowImpl.scala +++ b/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 */ diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/Flow.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/Flow.scala index ecf5acd6bc..d1e81f3122 100755 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/Flow.scala +++ b/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 diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/FlowWithContextOps.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/FlowWithContextOps.scala index 3c9e7c60c9..97165321f1 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/FlowWithContextOps.scala +++ b/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 diff --git a/akka-stream/src/main/scala/akka/stream/scaladsl/SubFlow.scala b/akka-stream/src/main/scala/akka/stream/scaladsl/SubFlow.scala index c4d64aeb4e..9351d8b339 100644 --- a/akka-stream/src/main/scala/akka/stream/scaladsl/SubFlow.scala +++ b/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 /** diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index 7a660386ba..4644d3592e 100644 --- a/project/AkkaBuild.scala +++ b/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") diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 4eb9e44713..8bd0dd943d 100644 --- a/project/Dependencies.scala +++ b/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" diff --git a/project/Doc.scala b/project/Doc.scala index fb41825479..f9c2606b5f 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.14", + unidocGenjavadocVersion := "0.15", scalacOptions in Compile ++= Seq("-P:genjavadoc:fabricateParams=true", "-P:genjavadoc:suppressSynthetic=false"))) .getOrElse(Nil) }