Skip to content

Commit

Permalink
bump: sbt 1.8.2, sbt-site 1.5, Akka 23.02 (#2950)
Browse files Browse the repository at this point in the history
  • Loading branch information
ennru authored Jan 25, 2023
1 parent 81b4a6d commit 6bb91f1
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 10 deletions.
10 changes: 9 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ lazy val xml = alpakkaProject("xml", "xml", Dependencies.Xml)
val JavaDocLinkVersion = "11"

lazy val docs = project
.enablePlugins(AkkaParadoxPlugin, ParadoxSitePlugin, PreprocessPlugin, PublishRsyncPlugin)
.enablePlugins(AkkaParadoxPlugin, ParadoxSitePlugin, SitePreviewPlugin, PreprocessPlugin, PublishRsyncPlugin)
.disablePlugins(MimaPlugin)
.settings(
Compile / paradox / name := "Alpakka",
Expand All @@ -347,14 +347,17 @@ lazy val docs = project
Preprocess / sourceDirectory := (LocalRootProject / ScalaUnidoc / unidoc / target).value,
Preprocess / preprocessRules := Seq(
// Java Platform Module System splits
// java.*
((s"https://docs\\.oracle\\.com/en/java/javase/${JavaDocLinkVersion}/docs/api/java/sql/").r,
_ => s"https://docs\\.oracle\\.com/en/java/javase/${JavaDocLinkVersion}/docs/api/java\\.sql/java/sql/"),
((s"https://docs\\.oracle\\.com/en/java/javase/${JavaDocLinkVersion}/docs/api/java/").r,
_ => s"https://docs\\.oracle\\.com/en/java/javase/${JavaDocLinkVersion}/docs/api/java\\.base/java/"),
// javax.*
((s"https://docs\\.oracle\\.com/en/java/javase/${JavaDocLinkVersion}/docs/api/javax/net/").r,
_ => s"https://docs\\.oracle\\.com/en/java/javase/${JavaDocLinkVersion}/docs/api/java\\.base/javax/net/"),
((s"https://docs\\.oracle\\.com/en/java/javase/${JavaDocLinkVersion}/docs/api/javax/xml/").r,
_ => s"https://docs\\.oracle\\.com/en/java/javase/${JavaDocLinkVersion}/docs/api/java\\.xml/javax/xml/"),
// org.w3c.*
((s"https://docs\\.oracle\\.com/en/java/javase/${JavaDocLinkVersion}/docs/api/org/w3c/").r,
_ => s"https://docs\\.oracle\\.com/en/java/javase/${JavaDocLinkVersion}/docs/api/java\\.xml/org/w3c/"),
// package duplication errors
Expand All @@ -367,6 +370,11 @@ lazy val docs = project
("https://javadoc\\.io/page/".r, _ => "https://javadoc\\.io/static/")
),
Paradox / siteSubdirName := s"docs/alpakka/${projectInfoVersion.value}",
// make use of https://github.com/scala/scala/pull/8663
Compile / doc / scalacOptions ++= Seq(
"-jdk-api-doc-base",
s"https://docs.oracle.com/en/java/javase/${JavaDocLinkVersion}/docs/api/java.base/"
),
paradoxProperties ++= Map(
"akka.version" -> Dependencies.AkkaVersion,
"akka-http.version" -> Dependencies.AkkaHttpVersion,
Expand Down
4 changes: 2 additions & 2 deletions docs/src/main/paradox/ftp.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ Scala
Java
: @@snip [snip](/ftp/src/test/java/docs/javadsl/FtpRemovingExample.java) { #removing }

This sink will consume @scaladoc[FtpFile](akka.stream.alpakka.ftp.FtpFile) elements and materializes to @scaladoc[Future](scala.concurrent.Future) in Scala API and @javadoc[CompletionStage](java/util/concurrent/CompletionStage) in Java API of @scaladoc[IOResult](akka.stream.IOResult) when the stream finishes.
This sink will consume @scaladoc[FtpFile](akka.stream.alpakka.ftp.FtpFile) elements and materializes to @scaladoc[Future](scala.concurrent.Future) in Scala API and @javadoc[CompletionStage](java.util.concurrent.CompletionStage) in Java API of @scaladoc[IOResult](akka.stream.IOResult) when the stream finishes.

## Moving files

Expand All @@ -128,7 +128,7 @@ Scala
Java
: @@snip [snip](/ftp/src/test/java/docs/javadsl/FtpMovingExample.java) { #moving }

This sink will consume @scaladoc[FtpFile](akka.stream.alpakka.ftp.FtpFile) elements and materializes to @scaladoc[Future](scala.concurrent.Future) in Scala API and @javadoc[CompletionStage](java/util/concurrent/CompletionStage) in Java API of @scaladoc[IOResult](akka.stream.IOResult) when the stream finishes.
This sink will consume @scaladoc[FtpFile](akka.stream.alpakka.ftp.FtpFile) elements and materializes to @scaladoc[Future](scala.concurrent.Future) in Scala API and @javadoc[CompletionStage](java.util.concurrent.CompletionStage) in Java API of @scaladoc[IOResult](akka.stream.IOResult) when the stream finishes.

Typical use-case for this would be listing files from a ftp location, do some processing and move the files when done. An example of this use case can be found below.

Expand Down
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ object Dependencies {
val AwsSdk2Version = "2.17.113"
val AwsSpiAkkaHttpVersion = "0.0.11"
// Sync with plugins.sbt
val AkkaGrpcBinaryVersion = "2.2"
val AkkaHttpVersion = "10.4.0"
val AkkaHttpBinaryVersion = "10.4"
val AkkaGrpcBinaryVersion = "2.3"
val AkkaHttpVersion = "10.5.0-M1"
val AkkaHttpBinaryVersion = "10.5"
val AlpakkaKafkaVersion = "4.0.0"
val ScalaTestVersion = "3.2.11"
val TestContainersScalaTestVersion = "0.40.3" // pulls Testcontainers 1.16.2
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.7.2
sbt.version=1.8.2
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.1")
addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
// docs
addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.45")
addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.46")
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox-dependencies" % "0.2.2")
addSbtPlugin("com.lightbend.sbt" % "sbt-publish-rsync" % "0.2")
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2")
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1")
addSbtPlugin("com.github.sbt" % "sbt-site-paradox" % "1.5.0-RC2")
// Akka gRPC -- sync with version in Dependencies.scala:19
addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.2.1")
addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.3.0-M2")
// templating
addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.6.1")

0 comments on commit 6bb91f1

Please sign in to comment.