From 6dba4103c5cd09258f6326146daa5721c39567b6 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 19 Jan 2025 00:42:50 +0100 Subject: [PATCH] Update scalafmt-core to 3.8.5 (#1290) * Update scalafmt-core to 3.8.5 * Reformat with scalafmt 3.8.5 Executed command: scalafmt --non-interactive * Add 'Reformat with scalafmt 3.8.5' to .git-blame-ignore-revs --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- .git-blame-ignore-revs | 3 +++ .scalafmt.conf | 2 +- build.sbt | 3 +-- .../scala/fs2/aws/dynamodb/NewDynamoDBConsumerSpec.scala | 4 ++-- .../src/test/scala/fs2/aws/dynamodb/StreamScanSpec.scala | 6 ++---- .../src/main/scala/fs2/aws/examples/KinesisExample.scala | 2 +- .../main/scala/fs2/aws/examples/KinesisExampleNew.scala | 2 +- .../fs2/aws/examples/KinesisMultistreamExample.scala | 2 +- .../src/main/scala/fs2/aws/examples/PureAWS.scala | 2 +- .../scala/fs2/aws/kinesis/NewKinesisConsumerSpec.scala | 4 ++-- .../test/scala/fs2/aws/kinesis/NewLocalStackSuite.scala | 2 +- fs2-aws-sqs/src/test/scala/fs2/aws/sqs/SqsSpec.scala | 8 +++----- 12 files changed, 19 insertions(+), 21 deletions(-) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 92d36f26..1d8a96a1 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -3,3 +3,6 @@ # Scala Steward: Reformat with scalafmt 3.7.2 4cbeb9075357d54afd60d51f7ad0c9835d5f9f99 + +# Scala Steward: Reformat with scalafmt 3.8.5 +11a3bcb191d4d2701361b5fee5ae5396593d6872 diff --git a/.scalafmt.conf b/.scalafmt.conf index 95207cef..edb35677 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version=3.8.3 +version=3.8.5 maxColumn = 120 diff --git a/build.sbt b/build.sbt index 464593a7..ff14bb9b 100644 --- a/build.sbt +++ b/build.sbt @@ -297,7 +297,7 @@ lazy val commonSettings = Def.settings( compilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1") ).filterNot(_ => scalaVersion.value.startsWith("3.")), Seq(Compile, Test).map { config => - (config / unmanagedSourceDirectories) ++= { + (config / unmanagedSourceDirectories) ++= (config / unmanagedSourceDirectories).value.flatMap { dir: File => dir.getName match { case "scala" => @@ -312,6 +312,5 @@ lazy val commonSettings = Def.settings( case _ => Seq(dir) } } - } } ) diff --git a/fs2-aws-dynamodb/src/test/scala/fs2/aws/dynamodb/NewDynamoDBConsumerSpec.scala b/fs2-aws-dynamodb/src/test/scala/fs2/aws/dynamodb/NewDynamoDBConsumerSpec.scala index 44cc2bb7..294533d0 100644 --- a/fs2-aws-dynamodb/src/test/scala/fs2/aws/dynamodb/NewDynamoDBConsumerSpec.scala +++ b/fs2-aws-dynamodb/src/test/scala/fs2/aws/dynamodb/NewDynamoDBConsumerSpec.scala @@ -202,7 +202,7 @@ class NewDynamoDBConsumerSpec .take(nRecords) // emulate message processing latency to reproduce the situation when End of Shard arrives BEFORE // all in-flight records are done - .parEvalMap(3)(msg => IO.sleep(200 millis) >> IO.pure(msg)) + .parEvalMap(3)(msg => IO.sleep(200.millis) >> IO.pure(msg)) .through( k.checkpointRecords( KinesisCheckpointSettings(maxBatchSize = Int.MaxValue, maxBatchWait = 500.millis) @@ -442,7 +442,7 @@ class NewDynamoDBConsumerSpec .build .map(stream => stream - .evalTap(_ => IO.sleep(100 millis)) + .evalTap(_ => IO.sleep(100.millis)) .map(i => if (errorStream) throw new Exception("boom") else i) .onFinalize(IO.delay(latch.countDown())) ) diff --git a/fs2-aws-dynamodb/src/test/scala/fs2/aws/dynamodb/StreamScanSpec.scala b/fs2-aws-dynamodb/src/test/scala/fs2/aws/dynamodb/StreamScanSpec.scala index d871a722..71e5754d 100644 --- a/fs2-aws-dynamodb/src/test/scala/fs2/aws/dynamodb/StreamScanSpec.scala +++ b/fs2-aws-dynamodb/src/test/scala/fs2/aws/dynamodb/StreamScanSpec.scala @@ -24,7 +24,7 @@ class StreamScanSpec extends AnyWordSpec with Matchers with ScalaFutures { PatienceConfig(timeout = scaled(Span(2, Minutes)), interval = scaled(Span(1, Second))) "DynamoDB scan" should { - "produce fs2 Stream form DDB scan operation" in { + "produce fs2 Stream form DDB scan operation" in resourcesF .use { case (tableName, ddb) => for { @@ -54,9 +54,8 @@ class StreamScanSpec extends AnyWordSpec with Matchers with ScalaFutures { } .unsafeToFuture() .futureValue - } - "fails stream on error" in { + "fails stream on error" in resourcesF .use { case (_, ddb) => StreamScan[IO](ddb) @@ -71,7 +70,6 @@ class StreamScanSpec extends AnyWordSpec with Matchers with ScalaFutures { } .unsafeToFuture() .futureValue - } } def resourcesF: Resource[IO, (String, DynamoDbAsyncClientOp[IO])] = for { diff --git a/fs2-aws-examples/src/main/scala/fs2/aws/examples/KinesisExample.scala b/fs2-aws-examples/src/main/scala/fs2/aws/examples/KinesisExample.scala index 552a4c55..334ac612 100644 --- a/fs2-aws-examples/src/main/scala/fs2/aws/examples/KinesisExample.scala +++ b/fs2-aws-examples/src/main/scala/fs2/aws/examples/KinesisExample.scala @@ -59,7 +59,7 @@ object KinesisExample extends IOApp { ): F[Unit] = ( Stream - .awakeEvery[F](5 seconds) + .awakeEvery[F](5.seconds) .map(_.toString()) .evalTap(d => Sync[F].delay(println(s"Producing $d"))) .map(d => (d, ByteBuffer.wrap(d.getBytes))) diff --git a/fs2-aws-examples/src/main/scala/fs2/aws/examples/KinesisExampleNew.scala b/fs2-aws-examples/src/main/scala/fs2/aws/examples/KinesisExampleNew.scala index 411acffc..28ec9d97 100644 --- a/fs2-aws-examples/src/main/scala/fs2/aws/examples/KinesisExampleNew.scala +++ b/fs2-aws-examples/src/main/scala/fs2/aws/examples/KinesisExampleNew.scala @@ -79,7 +79,7 @@ object KinesisExampleNew extends IOApp { ): F[Unit] = ( Stream - .awakeEvery[F](5 seconds) + .awakeEvery[F](5.seconds) .take(15) .map(_.toString()) .evalTap(d => Sync[F].delay(println(s"Producing $d"))) diff --git a/fs2-aws-examples/src/main/scala/fs2/aws/examples/KinesisMultistreamExample.scala b/fs2-aws-examples/src/main/scala/fs2/aws/examples/KinesisMultistreamExample.scala index b7e8952a..df5a9366 100644 --- a/fs2-aws-examples/src/main/scala/fs2/aws/examples/KinesisMultistreamExample.scala +++ b/fs2-aws-examples/src/main/scala/fs2/aws/examples/KinesisMultistreamExample.scala @@ -85,7 +85,7 @@ object KinesisMultistreamExample extends IOApp { ( streamNames.map { streamName => Stream - .awakeEvery[F](5 seconds) + .awakeEvery[F](5.seconds) .take(5) .map(e => s"$e -> $streamName") .evalTap(d => Sync[F].delay(println(s"Producing $d"))) diff --git a/fs2-aws-examples/src/main/scala/fs2/aws/examples/PureAWS.scala b/fs2-aws-examples/src/main/scala/fs2/aws/examples/PureAWS.scala index 0047dae6..b132e849 100644 --- a/fs2-aws-examples/src/main/scala/fs2/aws/examples/PureAWS.scala +++ b/fs2-aws-examples/src/main/scala/fs2/aws/examples/PureAWS.scala @@ -110,7 +110,7 @@ object PureAWSKleisli extends IOApp { .build() ) _ <- snsOp.publish(PublishRequest.builder().message("Barry").topicArn(topicArn).build()) - _ <- Temporal[F].sleep(5 seconds) + _ <- Temporal[F].sleep(5.seconds) msg <- sqsOp .receiveMessage( ReceiveMessageRequest diff --git a/fs2-aws-kinesis/src/test/scala/fs2/aws/kinesis/NewKinesisConsumerSpec.scala b/fs2-aws-kinesis/src/test/scala/fs2/aws/kinesis/NewKinesisConsumerSpec.scala index e9e4f6b7..fe066460 100644 --- a/fs2-aws-kinesis/src/test/scala/fs2/aws/kinesis/NewKinesisConsumerSpec.scala +++ b/fs2-aws-kinesis/src/test/scala/fs2/aws/kinesis/NewKinesisConsumerSpec.scala @@ -197,7 +197,7 @@ class NewKinesisConsumerSpec .take(nRecords.toLong) // emulate message processing latency to reproduce the situation when End of Shard arrives BEFORE // all in-flight records are done - .parEvalMap(3)(msg => IO.sleep(200 millis) >> IO.pure(msg)) + .parEvalMap(3)(msg => IO.sleep(200.millis) >> IO.pure(msg)) .through( k.checkpointRecords( KinesisCheckpointSettings(maxBatchSize = Int.MaxValue, maxBatchWait = 500.millis) @@ -440,7 +440,7 @@ class NewKinesisConsumerSpec .build .map(stream => stream - .evalTap(_ => IO.sleep(100 millis)) + .evalTap(_ => IO.sleep(100.millis)) .map(i => if (errorStream) throw new Exception("boom") else i) .onFinalize(IO.delay(latch.countDown())) ) diff --git a/fs2-aws-kinesis/src/test/scala/fs2/aws/kinesis/NewLocalStackSuite.scala b/fs2-aws-kinesis/src/test/scala/fs2/aws/kinesis/NewLocalStackSuite.scala index 7ad271b4..840590a4 100644 --- a/fs2-aws-kinesis/src/test/scala/fs2/aws/kinesis/NewLocalStackSuite.scala +++ b/fs2-aws-kinesis/src/test/scala/fs2/aws/kinesis/NewLocalStackSuite.scala @@ -162,7 +162,7 @@ class NewLocalStackSuite extends AnyFlatSpec with Matchers with ScalaFutures { IO.raiseError(new RuntimeException("Expected 2 shards")) else IO.unit }, - 2 seconds, + 2.seconds, _.*(2), 5, _.getMessage == "Expected 2 shards" diff --git a/fs2-aws-sqs/src/test/scala/fs2/aws/sqs/SqsSpec.scala b/fs2-aws-sqs/src/test/scala/fs2/aws/sqs/SqsSpec.scala index 9e8477e5..97104868 100644 --- a/fs2-aws-sqs/src/test/scala/fs2/aws/sqs/SqsSpec.scala +++ b/fs2-aws-sqs/src/test/scala/fs2/aws/sqs/SqsSpec.scala @@ -42,7 +42,7 @@ class SqsSpec extends AnyWordSpec with Matchers with BeforeAndAfterAll { .unsafeRunSync() "SQS" should { - "publish messages" in { + "publish messages" in sqsOpResource .use { sqsOp => (for { @@ -50,7 +50,7 @@ class SqsSpec extends AnyWordSpec with Matchers with BeforeAndAfterAll { sqs <- fs2.Stream.eval( SQS .create[IO]( - SqsConfig(queueUrl = queueUrl, pollRate = 10 milliseconds), + SqsConfig(queueUrl = queueUrl, pollRate = 10.milliseconds), sqsOp ) ) @@ -62,8 +62,6 @@ class SqsSpec extends AnyWordSpec with Matchers with BeforeAndAfterAll { } .unsafeRunSync() - } - "stream messages" in { val r = sqsOpResource .use { sqsOp => @@ -73,7 +71,7 @@ class SqsSpec extends AnyWordSpec with Matchers with BeforeAndAfterAll { .create[IO]( SqsConfig( queueUrl = queueUrl, - pollRate = 10 milliseconds, + pollRate = 10.milliseconds, fetchMessageCount = 1 ), sqsOp