Skip to content

Commit e3b0093

Browse files
authored
Merge pull request #15 from http4s/update/sbt-http4s-org-0.12.1
Update to sbt-http4s-org 0.12.1
2 parents 30fe8d3 + 55581a0 commit e3b0093

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ on:
1717
env:
1818
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
1919
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
20+
SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }}
2021
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
2122
PGP_SECRET: ${{ secrets.PGP_SECRET }}
2223
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -81,9 +82,9 @@ jobs:
8182
if: matrix.java == 'temurin@8'
8283
run: 'sbt ''project ${{ matrix.project }}'' ''++${{ matrix.scala }}'' ''set Global/scalaJSStage := ${{ matrix.sjsStage }}'' headerCheckAll scalafmtCheckAll ''project /'' scalafmtSbtCheck'
8384

84-
- name: fastOptJS
85+
- name: scalaJSLink
8586
if: matrix.project == 'rootJS'
86-
run: 'sbt ''project ${{ matrix.project }}'' ''++${{ matrix.scala }}'' ''set Global/scalaJSStage := ${{ matrix.sjsStage }}'' Test/fastOptJS'
87+
run: 'sbt ''project ${{ matrix.project }}'' ''++${{ matrix.scala }}'' ''set Global/scalaJSStage := ${{ matrix.sjsStage }}'' Test/scalaJSLinkerResult'
8788

8889
- name: Test
8990
run: 'sbt ''project ${{ matrix.project }}'' ''++${{ matrix.scala }}'' ''set Global/scalaJSStage := ${{ matrix.sjsStage }}'' test'
@@ -219,12 +220,12 @@ jobs:
219220
220221
- name: Import signing key
221222
if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == ''
222-
run: echo $PGP_SECRET | base64 -d | gpg --import
223+
run: echo $PGP_SECRET | base64 -di | gpg --import
223224

224225
- name: Import signing key and strip passphrase
225226
if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE != ''
226227
run: |
227-
echo "$PGP_SECRET" | base64 -d > /tmp/signing-key.gpg
228+
echo "$PGP_SECRET" | base64 -di > /tmp/signing-key.gpg
228229
echo "$PGP_PASSPHRASE" | gpg --pinentry-mode loopback --passphrase-fd 0 --import /tmp/signing-key.gpg
229230
(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)
230231

build.sbt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
ThisBuild / tlBaseVersion := "1.0"
22
ThisBuild / startYear := Some(2022)
33
ThisBuild / developers += tlGitHubDev("armanbilge", "Arman Bilge")
4-
ThisBuild / tlFatalWarningsInCi := false
4+
ThisBuild / tlVersionIntroduced := List("2.12", "2.13", "3").map(_ -> "1.0.3").toMap
5+
56
ThisBuild / crossScalaVersions := Seq("2.12.15", "3.1.1", "2.13.8")
7+
8+
ThisBuild / tlFatalWarningsInCi := false
9+
610
ThisBuild / githubWorkflowJavaVersions := List("8", "11").map(JavaSpec.temurin(_))
711
ThisBuild / githubWorkflowBuildMatrixAdditions += "sjsStage" -> List("FastOptStage", "FullOptStage")
812
ThisBuild / githubWorkflowBuildMatrixExclusions +=
@@ -15,7 +19,6 @@ lazy val hpack = crossProject(JVMPlatform, JSPlatform)
1519
.in(file("hpack"))
1620
.settings(
1721
name := "hpack",
18-
mimaPreviousArtifacts := Set.empty,
1922
libraryDependencies ++= Seq(
2023
"org.typelevel" %%% "cats-core" % "2.7.0" % Test,
2124
"io.circe" %%% "circe-parser" % "0.14.1" % Test,

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.12.0")
1+
addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.12.1")

0 commit comments

Comments
 (0)