Merge pull request #800 from typelevel/update/sbt-typelevel-0.7.4

Update sbt-typelevel, ... to 0.7.4
typelevel · Oct 11, 2024 · 2543ee2 · 2543ee2
2 parents dd085c8 + cfeeb8a
commit 2543ee2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,8 +35,7 @@ jobs:
     timeout-minutes: 60
     steps:
       - name: Install sbt
-        if: contains(runner.os, 'macos')
-        run: brew install sbt
+        uses: sbt/setup-sbt@v1
 
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
@@ -116,8 +115,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Install sbt
-        if: contains(runner.os, 'macos')
-        run: brew install sbt
+        uses: sbt/setup-sbt@v1
 
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
@@ -231,8 +229,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Install sbt
-        if: contains(runner.os, 'macos')
-        run: brew install sbt
+        uses: sbt/setup-sbt@v1
 
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
@@ -292,8 +289,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Install sbt
-        if: contains(runner.os, 'macos')
-        run: brew install sbt
+        uses: sbt/setup-sbt@v1
 
       - name: Checkout current branch (full)
         uses: actions/checkout@v4

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,6 +1,6 @@
-addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.3")
-addSbtPlugin("org.typelevel" % "sbt-typelevel-scalafix" % "0.7.3")
-addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.3")
+addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.4")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-scalafix" % "0.7.4")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.7.4")
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
 addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")

diff --git a/...porter/common/src/main/scala/org/typelevel/otel4s/sdk/exporter/otlp/grpc/GrpcCodecs.scala b/...porter/common/src/main/scala/org/typelevel/otel4s/sdk/exporter/otlp/grpc/GrpcCodecs.scala
@@ -47,7 +47,7 @@ private[otlp] object GrpcCodecs {
         }
       }
 
-    _.through(lpmDecoder).through(decompress).through(entityDecoder)
+    s => s.through(lpmDecoder).through(decompress).through(entityDecoder)
   }
 
   def encode[F[_]: RaiseThrowable: Compression, A](
@@ -63,12 +63,13 @@ private[otlp] object GrpcCodecs {
     val lpmEncoder: Pipe[F, LengthPrefixedMessage, Byte] =
       StreamEncoder.once(LengthPrefixedMessage.codec).toPipeByte
 
-    _.through(entityEncoder)
-      .through(compression)
-      .chunks
-      .foldMonoid
-      .map(chunks => LengthPrefixedMessage(gzip, chunks.toByteVector))
-      .through(lpmEncoder)
+    s =>
+      s.through(entityEncoder)
+        .through(compression)
+        .chunks
+        .foldMonoid
+        .map(chunks => LengthPrefixedMessage(gzip, chunks.toByteVector))
+        .through(lpmEncoder)
   }
 
 }