Merge branch 'master' into update/scala-native-0.5.0

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Scala Steward: Reformat with scalafmt 3.8.1
+499baded20f959dca86ad7a24d2244b7241de8c3

.scalafmt.conf

@@ -1,3 +1,3 @@
 runner.dialect = scala3
-version = 3.7.17
+version = 3.8.1
 maxColumn = 120

build.sbt

@@ -4,8 +4,8 @@ import com.softwaremill.Publish.ossPublishSettings
 import com.typesafe.tools.mima.core._
 
 val scala2_11 = "2.11.12"
-val scala2_12 = "2.12.18"
-val scala2_13 = "2.13.12"
+val scala2_12 = "2.12.19"
+val scala2_13 = "2.13.13"
 val scala2 = List(scala2_11, scala2_12, scala2_13)
 val scala2alive = List(scala2_12, scala2_13)
 val scala3 = List("3.3.3")
@@ -20,8 +20,8 @@ val fs2_2_version: Option[(Long, Long)] => String = {
  case Some((2, 11)) => "2.1.0"
  case _ => "2.5.9"
 }
-val fs2_3_version = "3.10.2"
-val armeriaVersion = "1.27.3"
+val fs2_3_version = "3.10.0"
+val armeriaVersion = "1.28.0"
 
 excludeLintKeys in Global ++= Set(ideSkipProject)
 
@@ -267,7 +267,7 @@ lazy val vertx = (projectMatrix in file("vertx"))
  .jvmPlatform(
  scalaVersions = List(scala2_12, scala2_13) ++ scala3,
  settings = commonJvmSettings ++ Seq(
- libraryDependencies += "io.vertx" % "vertx-core" % "4.5.4"
+ libraryDependencies += "io.vertx" % "vertx-core" % "4.5.7"
  )
  )
  .dependsOn(core)

pekko/src/main/scala/sttp/capabilities/pekko/PekkoStreams.scala

@@ -15,8 +15,8 @@ object PekkoStreams extends PekkoStreams {
  def limitBytes(stream: Source[ByteString, Any], maxBytes: Long): Source[ByteString, Any] = {
  stream
  .limitWeighted(maxBytes)(_.length.toLong)
- .mapError { 
- case _: pekko.stream.StreamLimitReachedException => StreamMaxLengthExceededException(maxBytes) 
+ .mapError { case _: pekko.stream.StreamLimitReachedException =>
+ StreamMaxLengthExceededException(maxBytes)
  }
  }
 }

pekko/src/test/scala/sttp/capabilities/pekko/PekkoStreamsTest.scala

@@ -36,7 +36,12 @@ class PekkoStreamsTest extends AnyFlatSpec with Matchers with BeforeAndAfterAll
  val stream = PekkoStreams.limitBytes(inputStream, maxBytes)
 
  // then
- stream.fold(0L)((acc, bs) => acc + bs.length).runWith(TestSink[Long]()).request(1).expectNext(inputByteCount.toLong).expectComplete()
+ stream
+ .fold(0L)((acc, bs) => acc + bs.length)
+ .runWith(TestSink[Long]())
+ .request(1)
+ .expectNext(inputByteCount.toLong)
+ .expectComplete()
  }
 
  it should "Fail stream if limit is exceeded" in {
@@ -51,7 +56,7 @@ class PekkoStreamsTest extends AnyFlatSpec with Matchers with BeforeAndAfterAll
  Source.fromIterator(() => iterator.grouped(chunkSize).map(group => ByteString(group.toArray)))
 
  // when
- val stream = PekkoStreams.limitBytes(inputStream, maxBytes) 
+ val stream = PekkoStreams.limitBytes(inputStream, maxBytes)
  val probe = stream.runWith(TestSink[ByteString]())
  val _ = for (_ <- 1 to 31) yield probe.requestNext()
 

project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.8
+sbt.version=1.9.9

project/plugins.sbt

@@ -1,5 +1,5 @@
 libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "1.1.1"
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
 addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.1")
 addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.0")