diff --git a/akka-docs/build.sbt b/akka-docs/build.sbt
index fe30d2ea6c..3b11aca333 100644
--- a/akka-docs/build.sbt
+++ b/akka-docs/build.sbt
@@ -16,7 +16,7 @@ site.publishSite
 SphinxDoc.sphinxPreprocessing
 SphinxDoc.docsSettings
 
-unmanagedSourceDirectories in ScalariformKeys.format in Test <<= unmanagedSourceDirectories in Test
+unmanagedSourceDirectories in ScalariformKeys.format in Test := (unmanagedSourceDirectories in Test).value
 additionalTasks in ValidatePR += generate in Sphinx
 
 enablePlugins(ScaladocNoVerificationOfDiagrams)
diff --git a/akka-stream-tests/src/test/scala/akka/stream/impl/GraphStageLogicSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/GraphStageLogicSpec.scala
index bfc32d3632..ad12964686 100644
--- a/akka-stream-tests/src/test/scala/akka/stream/impl/GraphStageLogicSpec.scala
+++ b/akka-stream-tests/src/test/scala/akka/stream/impl/GraphStageLogicSpec.scala
@@ -82,7 +82,7 @@ class GraphStageLogicSpec extends StreamSpec with GraphInterpreterSpecKit {
     override def toString = "GraphStageLogicSpec.emitEmptyIterable"
   }
 
-  final case class ReadNEmitN(n: Int) extends GraphStage[FlowShape[Int, Int]] {
+  private case class ReadNEmitN(n: Int) extends GraphStage[FlowShape[Int, Int]] {
     override val shape = FlowShape(Inlet[Int]("readN.in"), Outlet[Int]("readN.out"))
 
     override def createLogic(inheritedAttributes: Attributes): GraphStageLogic =
@@ -93,7 +93,7 @@ class GraphStageLogicSpec extends StreamSpec with GraphInterpreterSpecKit {
       }
   }
 
-  final case class ReadNEmitRestOnComplete(n: Int) extends GraphStage[FlowShape[Int, Int]] {
+  private case class ReadNEmitRestOnComplete(n: Int) extends GraphStage[FlowShape[Int, Int]] {
     override val shape = FlowShape(Inlet[Int]("readN.in"), Outlet[Int]("readN.out"))
 
     override def createLogic(inheritedAttributes: Attributes): GraphStageLogic =
diff --git a/akka-stream/src/main/scala/akka/stream/ActorMaterializer.scala b/akka-stream/src/main/scala/akka/stream/ActorMaterializer.scala
index 0c8d82e27e..af96073c52 100644
--- a/akka-stream/src/main/scala/akka/stream/ActorMaterializer.scala
+++ b/akka-stream/src/main/scala/akka/stream/ActorMaterializer.scala
@@ -433,7 +433,7 @@ final class ActorMaterializerSettings private (
    * this may cause an initial runtime overhead, but most of the time fusing is
    * desirable since it reduces the number of Actors that are created.
    */
-  @deprecated(since = "2.5.0", message = "Turning off fusing is no longer possible with the traversal based materializer")
+  @deprecated("Turning off fusing is no longer possible with the traversal based materializer", since = "2.5.0")
   def withAutoFusing(enable: Boolean): ActorMaterializerSettings =
     if (enable == this.autoFusing) this
     else copy(autoFusing = enable)
diff --git a/akka-stream/src/main/scala/akka/stream/impl/ConstantFun.scala b/akka-stream/src/main/scala/akka/stream/impl/ConstantFun.scala
index c8b3576596..fbf54b9f55 100644
--- a/akka-stream/src/main/scala/akka/stream/impl/ConstantFun.scala
+++ b/akka-stream/src/main/scala/akka/stream/impl/ConstantFun.scala
@@ -26,7 +26,7 @@ private[akka] object ConstantFun {
   def javaAnyToNone[A, B]: A ⇒ Option[B] = none
 
   val conforms = (a: Any) ⇒ a
-  
+
   val zeroLong = (_: Any) ⇒ 0L
 
   val oneLong = (_: Any) ⇒ 1L
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 227f6e732f..0506b47e04 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -205,7 +205,7 @@ object DependencyHelpers {
    * dependent entries.
    */
   def versionDependentDeps(modules: ScalaVersionDependentModuleID*): Def.Setting[Seq[ModuleID]] =
-    libraryDependencies <++= scalaVersion(version => modules.flatMap(m => m.modules(version)))
+    libraryDependencies ++= modules.flatMap(m => m.modules(scalaVersion.value))
 
   val ScalaVersion = """\d\.\d+\.\d+(?:-(?:M|RC)\d+)?""".r
   val nominalScalaVersion: String => String = {