Update dependencies (#301)

etspaceman · Feb 29, 2024 · 8c50121 · 8c50121
1 parent 4289385
commit 8c50121
Show file tree

Hide file tree

Showing 28 changed files with 231 additions and 217 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,6 +35,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
     steps:
+      - name: Install sbt
+        if: contains(runner.os, 'macos')
+        run: brew install sbt
+
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:
@@ -124,7 +128,7 @@ jobs:
 
       - name: Upload target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}-${{ matrix.project }}
           path: targets.tar
@@ -139,6 +143,10 @@ jobs:
         java: [temurin@17]
     runs-on: ${{ matrix.os }}
     steps:
+      - name: Install sbt
+        if: contains(runner.os, 'macos')
+        run: brew install sbt
+
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:
@@ -158,7 +166,7 @@ jobs:
         run: sbt +update
 
       - name: Download target directories (2.13, root-jvm-212)
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-root-jvm-212
 
@@ -168,7 +176,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.13, root-jvm-213)
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-root-jvm-213
 
@@ -178,7 +186,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.13, root-jvm-3)
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-root-jvm-3
 
@@ -188,7 +196,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.13, root-js-212)
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-root-js-212
 
@@ -198,7 +206,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.13, root-js-213)
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-root-js-213
 
@@ -208,7 +216,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.13, root-js-3)
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-root-js-3
 
@@ -218,7 +226,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.13, root-native-212)
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-root-native-212
 
@@ -228,7 +236,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.13, root-native-213)
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-root-native-213
 
@@ -238,7 +246,7 @@ jobs:
           rm targets.tar
 
       - name: Download target directories (2.13, root-native-3)
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-root-native-3
 
@@ -280,6 +288,10 @@ jobs:
         java: [temurin@17]
     runs-on: ${{ matrix.os }}
     steps:
+      - name: Install sbt
+        if: contains(runner.os, 'macos')
+        run: brew install sbt
+
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:
@@ -337,6 +349,10 @@ jobs:
         java: [temurin@17]
     runs-on: ${{ matrix.os }}
     steps:
+      - name: Install sbt
+        if: contains(runner.os, 'macos')
+        run: brew install sbt
+
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:

diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.7.17
+version = 3.8.0
 project.git = true
 runner.dialect = scala213Source3
 

diff --git a/kcl-logging-circe/src/main/scala/kinesis4cats/kcl/logging/instances/circe.scala b/kcl-logging-circe/src/main/scala/kinesis4cats/kcl/logging/instances/circe.scala
@@ -44,7 +44,7 @@ object circe {
           .safeAdd("schemaDefinition", x.getSchemaDefinition())
           .safeAdd("schemaName", x.getSchemaName())
 
-      Json.obj(fields.toSeq: _*)
+      Json.obj(fields.toSeq*)
     }
 
     implicit val hashKeyRangeEncoder: Encoder[HashKeyRange] = x => {
@@ -54,7 +54,7 @@ object circe {
           .safeAdd("endingHashKey", x.endingHashKey())
           .safeAdd("startingHashKey", x.startingHashKey())
 
-      Json.obj(fields.toSeq: _*)
+      Json.obj(fields.toSeq*)
     }
 
     implicit val childShardEncoder: Encoder[ChildShard] = x => {
@@ -66,7 +66,7 @@ object circe {
           .safeAdd("parentShards", x.parentShards())
           .safeAdd("shardId", x.shardId())
 
-      Json.obj(fields.toSeq: _*)
+      Json.obj(fields.toSeq*)
     }
 
     implicit val extendedSequenceNumberEncoder
@@ -78,7 +78,7 @@ object circe {
             .safeAdd("sequenceNumber", x.sequenceNumber())
             .safeAdd("subSequenceNumber", x.subSequenceNumber())
 
-        Json.obj(fields.toSeq: _*)
+        Json.obj(fields.toSeq*)
       }
 
     implicit val initializationInputEncoder: Encoder[InitializationInput] = x =>
@@ -93,7 +93,7 @@ object circe {
               x.pendingCheckpointSequenceNumber()
             )
 
-        Json.obj(fields.toSeq: _*)
+        Json.obj(fields.toSeq*)
       }
 
     implicit val processRecordsInputEncoder: Encoder[ProcessRecordsInput] = x =>
@@ -108,7 +108,7 @@ object circe {
             .safeAdd("millisBehindLatest", x.millisBehindLatest())
             .safeAdd("timeSpentInCache", x.timeSpentInCache())
 
-        Json.obj(fields.toSeq: _*)
+        Json.obj(fields.toSeq*)
       }
 
     implicit val kinesisClientRecordEncoder: Encoder[KinesisClientRecord] = x =>
@@ -129,7 +129,7 @@ object circe {
             .safeAdd("subSequenceNumber", x.subSequenceNumber())
             .safeAdd("data", x.data())
 
-        Json.obj(fields.toSeq: _*)
+        Json.obj(fields.toSeq*)
       }
 
     new RecordProcessor.LogEncoders

diff --git a/kcl/src/main/scala/kinesis4cats/kcl/KCLConsumer.scala b/kcl/src/main/scala/kinesis4cats/kcl/KCLConsumer.scala
@@ -364,7 +364,7 @@ object KCLConsumer {
 
   object ProcessConfig {
     val default: ProcessConfig =
-      ProcessConfig(true, RecordProcessor.Config.default, None)
+      ProcessConfig(raiseOnError = true, RecordProcessor.Config.default, None)
   }
 
   object Config {

diff --git a/kcl/src/main/scala/kinesis4cats/kcl/RecordProcessor.scala b/kcl/src/main/scala/kinesis4cats/kcl/RecordProcessor.scala
@@ -284,7 +284,7 @@ object RecordProcessor {
   )
 
   object Config {
-    val default = Config(None, 5, 0.seconds, true)
+    val default = Config(None, 5, 0.seconds, autoCommit = true)
   }
 
   /** An implementation of the

diff --git a/kcl/src/test/scala/kinesis4cats/kcl/RecordProcessorSpec.scala b/kcl/src/test/scala/kinesis4cats/kcl/RecordProcessorSpec.scala
@@ -40,7 +40,7 @@ class RecordProcessorSpec extends munit.CatsEffectSuite {
         .Factory[IO](
           RecordProcessor.Config.default,
           deferredException,
-          true
+          raiseOnError = true
         )(recs => resultsQueue.tryOfferN(recs).void)
         .use { factory =>
           for {
@@ -98,7 +98,7 @@ class RecordProcessorSpec extends munit.CatsEffectSuite {
         .Factory[IO](
           RecordProcessor.Config.default,
           deferredException,
-          true
+          raiseOnError = true
         )(_ => IO.raiseError(expected))
         .use { factory =>
           for {

diff --git a/...localstack/src/main/scala/kinesis4cats/client/localstack/LocalstackCloudWatchClient.scala b/...localstack/src/main/scala/kinesis4cats/client/localstack/LocalstackCloudWatchClient.scala
@@ -55,7 +55,7 @@ object LocalstackCloudWatchClient {
       underlying <- clientResource
       client <- CloudWatchClient.Builder
         .default[F]
-        .withClient(underlying, false)
+        .withClient(underlying, managed = false)
         .withLogEncoders(encoders)
         .withLogger(logger)
         .build

diff --git a/...ent-localstack/src/main/scala/kinesis4cats/client/localstack/LocalstackDynamoClient.scala b/...ent-localstack/src/main/scala/kinesis4cats/client/localstack/LocalstackDynamoClient.scala
@@ -54,7 +54,7 @@ object LocalstackDynamoClient {
       underlying <- clientResource
       client <- DynamoClient.Builder
         .default[F]
-        .withClient(underlying, false)
+        .withClient(underlying, managed = false)
         .withLogEncoders(encoders)
         .withLogger(logger)
         .build

diff --git a/...nt-localstack/src/main/scala/kinesis4cats/client/localstack/LocalstackKinesisClient.scala b/...nt-localstack/src/main/scala/kinesis4cats/client/localstack/LocalstackKinesisClient.scala
@@ -63,7 +63,7 @@ object LocalstackKinesisClient {
       underlying <- clientResource
       client <- KinesisClient.Builder
         .default[F]
-        .withClient(underlying, false)
+        .withClient(underlying, managed = false)
         .withLogEncoders(encoders)
         .withLogger(logger)
         .build