diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 88995ed..18dbaf7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,7 +41,7 @@ jobs: - name: Setup Java (temurin@11) id: setup-java-temurin-11 if: matrix.java == 'temurin@11' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 11 @@ -54,7 +54,7 @@ jobs: - name: Setup Java (temurin@17) id: setup-java-temurin-17 if: matrix.java == 'temurin@17' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 17 @@ -119,7 +119,7 @@ jobs: - name: Setup Java (temurin@11) id: setup-java-temurin-11 if: matrix.java == 'temurin@11' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 11 @@ -132,7 +132,7 @@ jobs: - name: Setup Java (temurin@17) id: setup-java-temurin-17 if: matrix.java == 'temurin@17' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 17 @@ -157,7 +157,7 @@ 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 != '' @@ -165,7 +165,7 @@ jobs: 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) @@ -193,7 +193,7 @@ jobs: - name: Setup Java (temurin@11) id: setup-java-temurin-11 if: matrix.java == 'temurin@11' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 11 @@ -206,7 +206,7 @@ jobs: - name: Setup Java (temurin@17) id: setup-java-temurin-17 if: matrix.java == 'temurin@17' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 17 @@ -236,7 +236,7 @@ jobs: - name: Setup Java (temurin@11) id: setup-java-temurin-11 if: matrix.java == 'temurin@11' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 11 @@ -263,7 +263,7 @@ jobs: - name: Setup Java (temurin@11) id: setup-java-temurin-11 if: matrix.java == 'temurin@11' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 11 @@ -276,7 +276,7 @@ jobs: - name: Setup Java (temurin@17) id: setup-java-temurin-17 if: matrix.java == 'temurin@17' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: temurin java-version: 17 diff --git a/build.sbt b/build.sbt index 2deb983..39a6ae9 100644 --- a/build.sbt +++ b/build.sbt @@ -14,7 +14,7 @@ lazy val core = project name := "sbt-circe-org" ) -ThisBuild / tlBaseVersion := "0.2" +ThisBuild / tlBaseVersion := "0.3" ThisBuild / crossScalaVersions := Seq("2.12.18") ThisBuild / developers := List( tlGitHubDev("lorandszakacs", "Loránd Szakács") diff --git a/core/build.sbt b/core/build.sbt index 1edeb3d..6f59ba4 100644 --- a/core/build.sbt +++ b/core/build.sbt @@ -1,4 +1,4 @@ -val sbtTypelevelVersion = "0.5.3" // https://github.com/typelevel/sbt-typelevel/releases +val sbtTypelevelVersion = "0.6.4" // https://github.com/typelevel/sbt-typelevel/releases val sbtScoverageVersion = "2.0.9" // https://github.com/scoverage/sbt-scoverage/releases addSbtPlugin("org.typelevel" % "sbt-typelevel" % sbtTypelevelVersion) diff --git a/core/src/main/scala/io/circe/sbt/CirceOrgSitePlugin.scala b/core/src/main/scala/io/circe/sbt/CirceOrgSitePlugin.scala index 1887c92..18b91a0 100644 --- a/core/src/main/scala/io/circe/sbt/CirceOrgSitePlugin.scala +++ b/core/src/main/scala/io/circe/sbt/CirceOrgSitePlugin.scala @@ -16,7 +16,6 @@ package io.circe.sbt -import cats.data.NonEmptyList import laika.ast.Path.Root import laika.ast._ import laika.helium.config.Favicon @@ -73,7 +72,8 @@ object CirceOrgSitePlugin extends AutoPlugin { ThemeNavigationSection( "Related Projects", - NonEmptyList.fromListUnsafe(mappings) + mappings.head, + mappings.tail * ) }