Merge pull request #331 from http4s/update/sbt-http4s-org-0.16.0

Update sbt-http4s-org to 0.16.0
http4s · Oct 18, 2023 · dc5bd4e · dc5bd4e
2 parents 41eb128 + 1c4ab20
commit dc5bd4e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -167,15 +167,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/build.sbt b/build.sbt
@@ -274,24 +274,22 @@ lazy val docs = project
       "CIRCE_VERSION" -> circeVersion
     ),
     laikaConfig := {
-      import laika.rewrite.link._
+      import laika.config._
       laikaConfig
         .value
         .withRawContent
-        .withConfigValue(LinkConfig(apiLinks = List(
-          ApiLinks(
-            baseUri =
-              s"https://www.javadoc.io/doc/org.http4s/http4s-dom_sjs1_2.13/${mdocVariables.value("VERSION")}/",
-            packagePrefix = "org.http4s.dom"),
-          ApiLinks(
-            baseUri = s"https://www.javadoc.io/doc/org.http4s/http4s-docs_2.13/$http4sVersion/",
-            packagePrefix = "org.http4s"
-          )
-        )))
-    },
-    tlSiteHelium ~= {
-      // Actually, this *disables* auto-linking, to avoid duplicates with mdoc
-      _.site.autoLinkJS()
+        .withConfigValue(
+          LinkConfig
+            .empty
+            .addApiLinks(
+              ApiLinks(
+                s"https://www.javadoc.io/doc/org.http4s/http4s-dom_sjs1_2.13/${mdocVariables.value("VERSION")}/")
+                .withPackagePrefix("org.http4s.dom"),
+              ApiLinks(
+                s"https://www.javadoc.io/doc/org.http4s/http4s-docs_2.13/$http4sVersion/")
+                .withPackagePrefix("org.http4s")
+            )
+        )
     }
   )
   .enablePlugins(Http4sOrgSitePlugin)
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -7,7 +7,7 @@ libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "1.1.1"
 libraryDependencies += "org.http4s" %% "http4s-dsl" % http4sVersion
 libraryDependencies += "org.http4s" %% "http4s-ember-server" % http4sVersion
 
-addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.15.3")
+addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.16.0")
 addSbtPlugin("com.armanbilge" % "sbt-bundlemon" % "0.1.4")
 addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7")
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0")