Merge pull request #604 from http4s/update/sbt-http4s-org-0.10.0

Update to sbt-http4s-org-0.10.0

Author: rossabaker

Diff for: .github/workflows/ci.yml

@@ -12,11 +12,11 @@ on:
     branches: ['**']
   push:
     branches: ['**']
-    tags: [v*, v*]
+    tags: [v*]
 
 env:
+  PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
   SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-  JABBA_INDEX: 'https://github.com/typelevel/jdk-index/raw/main/index.json'
   SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
   PGP_SECRET: ${{ secrets.PGP_SECRET }}
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -28,19 +28,21 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.15, 2.13.8, 3.0.2]
-        java: [adoptium@8]
+        scala: [3.0.2, 2.12.15, 2.13.8]
+        java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Setup Java and Scala
-        uses: olafurpg/setup-scala@v13
+      - name: Setup Java (temurin@8)
+        if: matrix.java == 'temurin@8'
+        uses: actions/setup-java@v2
         with:
-          java-version: ${{ matrix.java }}
+          distribution: temurin
+          java-version: 8
 
       - name: Cache sbt
         uses: actions/cache@v2
@@ -55,9 +57,37 @@ jobs:
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
       - name: Check that workflows are up to date
-        run: sbt ++${{ matrix.scala }} githubWorkflowCheck
+        run: sbt '++${{ matrix.scala }}' 'project /' githubWorkflowCheck
 
-      - run: sbt ++${{ matrix.scala }} validate-ci
+      - name: Check headers and formatting
+        run: sbt '++${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
+
+      - name: Test
+        run: sbt '++${{ matrix.scala }}' test
+
+      - name: Check binary compatibility
+        run: sbt '++${{ matrix.scala }}' mimaReportBinaryIssues
+
+      - name: Generate API documentation
+        run: sbt '++${{ matrix.scala }}' doc
+
+      - name: Check Java formatting
+        run: sbt '++${{ matrix.scala }}' '${{ matrix.ci }}' javafmtCheckAll
+
+      - name: Check unused compile dependencies
+        run: sbt '++${{ matrix.scala }}' unusedCompileDependenciesTest
+
+      - name: Make target directories
+        run: mkdir -p target examples/target http/target core/target testkit/target project/target
+
+      - name: Compress target directories
+        run: tar cf targets.tar target examples/target http/target core/target testkit/target project/target
+
+      - name: Upload target directories
+        uses: actions/upload-artifact@v2
+        with:
+          name: target-${{ matrix.os }}-${{ matrix.scala }}-${{ matrix.java }}
+          path: targets.tar
 
   publish:
     name: Publish Artifacts
@@ -67,18 +97,20 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.13.8]
-        java: [adoptium@8]
+        java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
-      - name: Setup Java and Scala
-        uses: olafurpg/setup-scala@v13
+      - name: Setup Java (temurin@8)
+        if: matrix.java == 'temurin@8'
+        uses: actions/setup-java@v2
         with:
-          java-version: ${{ matrix.java }}
+          distribution: temurin
+          java-version: 8
 
       - name: Cache sbt
         uses: actions/cache@v2
@@ -92,10 +124,46 @@ jobs:
             ~/Library/Caches/Coursier/v1
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
+      - name: Download target directories (3.0.2)
+        uses: actions/download-artifact@v2
+        with:
+          name: target-${{ matrix.os }}-3.0.2-${{ matrix.java }}
+
+      - name: Inflate target directories (3.0.2)
+        run: |
+          tar xf targets.tar
+          rm targets.tar
+
+      - name: Download target directories (2.12.15)
+        uses: actions/download-artifact@v2
+        with:
+          name: target-${{ matrix.os }}-2.12.15-${{ matrix.java }}
+
+      - name: Inflate target directories (2.12.15)
+        run: |
+          tar xf targets.tar
+          rm targets.tar
+
+      - name: Download target directories (2.13.8)
+        uses: actions/download-artifact@v2
+        with:
+          name: target-${{ matrix.os }}-2.13.8-${{ matrix.java }}
+
+      - name: Inflate target directories (2.13.8)
+        run: |
+          tar xf targets.tar
+          rm targets.tar
+
       - name: Import signing key
+        if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == ''
         run: echo $PGP_SECRET | base64 -d | gpg --import
 
-      - run: sbt ++${{ matrix.scala }} +publish
+      - name: Import signing key and strip passphrase
+        if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE != ''
+        run: |
+          echo "$PGP_SECRET" | base64 -d > /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)
 
-      - if: startsWith(github.ref, 'refs/tags/v')
-        run: sbt ++${{ matrix.scala }} sonatypeBundleRelease
+      - name: Publish
+        run: sbt '++${{ matrix.scala }}' tlRelease

Diff for: build.sbt

@@ -1,24 +1,21 @@
 import com.typesafe.tools.mima.core._
 import Dependencies._
 
-ThisBuild / publishGithubUser := "rossabaker"
-ThisBuild / publishFullName := "Ross A. Baker"
-ThisBuild / baseVersion := "0.15"
-
-ThisBuild / versionIntroduced := Map(
-  "2.13" -> "0.14.5",
-  "3.0.0-M3" -> "0.15.0",
-  "3.0.0-RC1" -> "0.15.0",
-  "3.0.0-RC2" -> "0.15.0",
-  "3.0.0-RC3" -> "0.15.0"
-)
-
 val Scala212 = "2.12.15"
 val Scala213 = "2.13.8"
 val Scala3 = "3.0.2"
 
-ThisBuild / crossScalaVersions := Seq(Scala212, Scala213, Scala3)
+ThisBuild / crossScalaVersions := Seq(Scala3, Scala212, Scala213)
 ThisBuild / scalaVersion := crossScalaVersions.value.filter(_.startsWith("2.")).last
+ThisBuild / tlBaseVersion := "0.15"
+ThisBuild / tlVersionIntroduced := Map(
+  "2.13" -> "0.14.5",
+  "3" -> "0.15.0"
+)
+ThisBuild / tlFatalWarningsInCi := !tlIsScala3.value // See SSLStage
+
+// 11 and 17 blocked by https://github.com/http4s/blaze/issues/376
+ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("8"))
 
 lazy val commonSettings = Seq(
   description := "NIO Framework for Scala",
@@ -51,35 +48,17 @@ lazy val commonSettings = Seq(
       "[email protected]",
       url("https://github.com/ChristopherDavenport"))
   ),
-  licenses := Seq("Apache-2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0.html")),
-  homepage := Some(url("https://github.com/http4s/blaze")),
-  scmInfo := Some(
-    ScmInfo(
-      url("https://github.com/http4s/blaze"),
-      "scm:git:https://github.com/http4s/blaze.git",
-      Some("scm:git:[email protected]:http4s/blaze.git")
-    )
-  ),
-  startYear := Some(2014),
-  libraryDependencies ++= (
-    if (ScalaArtifacts.isScala3(scalaVersion.value)) Nil
-    else
-      Seq(
-        compilerPlugin(kindProjector.cross(CrossVersion.full))
-      )
-  )
+  startYear := Some(2014)
 )
 
-ThisBuild / githubWorkflowJavaVersions := Seq("adoptium@8")
-
-ThisBuild / githubWorkflowTargetTags ++= Seq("v*")
-
 // currently only publishing tags
 ThisBuild / githubWorkflowPublishTargetBranches :=
   Seq(RefPredicate.StartsWith(Ref.Tag("v")), RefPredicate.Equals(Ref.Branch("main")))
 
-ThisBuild / githubWorkflowBuild := Seq(
-  WorkflowStep.Sbt(List("validate-ci"))
+ThisBuild / githubWorkflowBuild ++= Seq(
+  WorkflowStep.Sbt(
+    List("${{ matrix.ci }}", "javafmtCheckAll"),
+    name = Some("Check Java formatting"))
 )
 
 lazy val blaze = project
@@ -150,8 +129,3 @@ lazy val examples = Project("blaze-examples", file("examples"))
 addCommandAlias(
   "validate",
   ";scalafmtCheckAll ;scalafmtSbtCheck ;javafmtCheckAll ;+test:compile ;test ;unusedCompileDependenciesTest ;mimaReportBinaryIssues")
-
-// use it in the CI pipeline
-addCommandAlias(
-  "validate-ci",
-  ";scalafmtCheckAll ;scalafmtSbtCheck ;javafmtCheckAll ;test ;unusedCompileDependenciesTest ;mimaReportBinaryIssues")

Diff for: core/src/main/scala/org/http4s/blaze/pipeline/stages/SSLStage.scala

@@ -236,6 +236,13 @@ final class SSLStage(engine: SSLEngine, maxWrite: Int = 1024 * 1024)
             case DelayedRead(sz, p) => doRead(sz, p)
             case DelayedWrite(d, p) => doWrite(d, p)
           }
+
+        case unexpected =>
+          // This warns as unreachable on Scala 3 / Java 8, but does
+          // not warn on Scala 2, so we can't use @nowarn.
+
+          // Java 9 adds NEED_UNWRAP_AGAIN, which only applies to DTLS
+          handshakeFailure(util.bug(s"Unknown status: ${unexpected}"))
       }
 
     val start = System.nanoTime

Diff for: project/plugins.sbt

@@ -1,5 +1,5 @@
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
 addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.7.0")
 addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
-addSbtPlugin("org.http4s" %% "sbt-http4s-org" % "0.8.3")
+addSbtPlugin("org.http4s" %% "sbt-http4s-org" % "0.10.0")
 addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")