Merge branch 'main' into update/fs2-core-3.9.3

CJSmith-0141 · Dec 19, 2023 · 1c3c9bf · 1c3c9bf
2 parents a4525b1 + 7c24382
commit 1c3c9bf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -124,15 +124,15 @@ jobs:
         env:
           PGP_SECRET: ${{ secrets.PGP_SECRET }}
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
-        run: echo $PGP_SECRET | base64 -di | gpg --import
+        run: echo $PGP_SECRET | base64 -d -i - | gpg --import
 
       - name: Import signing key and strip passphrase
         if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE != ''
         env:
           PGP_SECRET: ${{ secrets.PGP_SECRET }}
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
         run: |
-          echo "$PGP_SECRET" | base64 -di > /tmp/signing-key.gpg
+          echo "$PGP_SECRET" | base64 -d -i - > /tmp/signing-key.gpg
           echo "$PGP_PASSPHRASE" | gpg --pinentry-mode loopback --passphrase-fd 0 --import /tmp/signing-key.gpg
           (echo "$PGP_PASSPHRASE"; echo; echo) | gpg --command-fd 0 --pinentry-mode loopback --change-passphrase $(gpg --list-secret-keys --with-colons 2> /dev/null | grep '^sec:' | cut --delimiter ':' --fields 5 | tail -n 1)
 

diff --git a/project/BouncyCastlePlugin.scala b/project/BouncyCastlePlugin.scala
@@ -73,7 +73,7 @@ object BouncyCastlePlugin extends AutoPlugin {
         libraryDependencies ++= {
           Seq(
             "org.typelevel" %% "cats-core" % "2.10.0",
-            "org.typelevel" %% "cats-effect" % "3.5.1",
+            "org.typelevel" %% "cats-effect" % "3.5.2",
             "co.fs2" %% "fs2-core" % "3.9.3",
             "co.fs2" %% "fs2-io" % "3.9.3",
             "com.chuusai" %% "shapeless" % "2.3.10",

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.9.6
+sbt.version=1.9.8
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,4 +1,4 @@
-addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.5.3")
-addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.5.3")
-addSbtPlugin("org.typelevel" % "sbt-typelevel-settings" % "0.5.3")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.5.4")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.5.4")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-settings" % "0.5.4")
 addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.3.1")