Skip to content

Commit a6bca6b

Browse files
authored
Merge branch 'master' into update/fs2-core-3.10.0
2 parents 405ab8b + a72d5fc commit a6bca6b

File tree

6 files changed

+18
-8
lines changed

6 files changed

+18
-8
lines changed

.git-blame-ignore-revs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Scala Steward: Reformat with scalafmt 3.8.1
2+
499baded20f959dca86ad7a24d2244b7241de8c3

.scala-steward.conf

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@ updates.ignore = [
33
{groupId = "org.scala-lang", artifactId = "scala-compiler", version = "2.13."},
44
{groupId = "org.scala-lang", artifactId = "scala-compiler", version = "3."}
55
]
6-
updates.pin = [{ groupId = "com.typesafe.akka", version = "2.6." }]
6+
updates.pin = [
7+
{groupId = "org.scala-lang", artifactId = "scala3-library", version = "3.3."},
8+
{groupId = "com.typesafe.akka", version = "2.6."}
9+
]

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
runner.dialect = scala3
2-
version = 3.7.17
2+
version = 3.8.1
33
maxColumn = 120

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ val fs2_2_version: Option[(Long, Long)] => String = {
2121
case _ => "2.5.9"
2222
}
2323
val fs2_3_version = "3.10.0"
24-
val armeriaVersion = "1.27.2"
24+
val armeriaVersion = "1.27.3"
2525

2626
excludeLintKeys in Global ++= Set(ideSkipProject)
2727

@@ -276,7 +276,7 @@ lazy val vertx = (projectMatrix in file("vertx"))
276276
.jvmPlatform(
277277
scalaVersions = List(scala2_12, scala2_13) ++ scala3,
278278
settings = commonJvmSettings ++ Seq(
279-
libraryDependencies += "io.vertx" % "vertx-core" % "4.5.4"
279+
libraryDependencies += "io.vertx" % "vertx-core" % "4.5.7"
280280
)
281281
)
282282
.dependsOn(core)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ object PekkoStreams extends PekkoStreams {
1515
def limitBytes(stream: Source[ByteString, Any], maxBytes: Long): Source[ByteString, Any] = {
1616
stream
1717
.limitWeighted(maxBytes)(_.length.toLong)
18-
.mapError {
19-
case _: pekko.stream.StreamLimitReachedException => StreamMaxLengthExceededException(maxBytes)
18+
.mapError { case _: pekko.stream.StreamLimitReachedException =>
19+
StreamMaxLengthExceededException(maxBytes)
2020
}
2121
}
2222
}

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,12 @@ class PekkoStreamsTest extends AnyFlatSpec with Matchers with BeforeAndAfterAll
3636
val stream = PekkoStreams.limitBytes(inputStream, maxBytes)
3737

3838
// then
39-
stream.fold(0L)((acc, bs) => acc + bs.length).runWith(TestSink[Long]()).request(1).expectNext(inputByteCount.toLong).expectComplete()
39+
stream
40+
.fold(0L)((acc, bs) => acc + bs.length)
41+
.runWith(TestSink[Long]())
42+
.request(1)
43+
.expectNext(inputByteCount.toLong)
44+
.expectComplete()
4045
}
4146

4247
it should "Fail stream if limit is exceeded" in {
@@ -51,7 +56,7 @@ class PekkoStreamsTest extends AnyFlatSpec with Matchers with BeforeAndAfterAll
5156
Source.fromIterator(() => iterator.grouped(chunkSize).map(group => ByteString(group.toArray)))
5257

5358
// when
54-
val stream = PekkoStreams.limitBytes(inputStream, maxBytes)
59+
val stream = PekkoStreams.limitBytes(inputStream, maxBytes)
5560
val probe = stream.runWith(TestSink[ByteString]())
5661
val _ = for (_ <- 1 to 31) yield probe.requestNext()
5762

0 commit comments

Comments
 (0)