Update scala-library to 2.13.15

.github/workflows/ci.yml

@@ -22,45 +22,63 @@ jobs:
     name: Build and Test
     strategy:
       matrix:
-        os: [ubuntu-latest]
-        scala: [2.12.18, 2.13.11, 3.3.0]
-        java: [temurin@8, temurin@11, temurin@17]
+        os: [ubuntu-latest, macos-12, macos-latest]
+        scala: [2.12.20, 2.13.15, 3.3.3]
+        java: [temurin@8, temurin@11, temurin@17, temurin@21]
+        exclude:
+          - java: temurin@8
+            os: macos-latest
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Setup Java (temurin@8)
         if: matrix.java == 'temurin@8'
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 8
           cache: sbt
 
       - name: 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
           cache: sbt
 
       - name: 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
           cache: sbt
 
+      - name: Setup Java (temurin@21)
+        if: matrix.java == 'temurin@21'
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 21
+          cache: sbt
+
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+
+      - name: Install sbt
+        if: matrix.os == 'macos-latest'
+        run: brew install sbt
+
       - name: Check that workflows are up to date
         run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck
 
-      - name: Report binary compatibility issues
-        run: sbt '++ ${{ matrix.scala }}' mimaReportBinaryIssues
+      - name: Report version policy issues
+        run: sbt '++ ${{ matrix.scala }}' versionPolicyCheck
 
       - name: Build project
         run: sbt '++ ${{ matrix.scala }}' clean coverage test
@@ -75,7 +93,7 @@ jobs:
         run: tar cf targets.tar target support/stream-circe/target http-json/target tests/target stream-json/target support/http-circe/target project/target
 
       - name: Upload target directories
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: target-${{ matrix.os }}-${{ matrix.scala }}-${{ matrix.java }}
           path: targets.tar
@@ -87,65 +105,76 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.11]
+        scala: [2.13.15]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Setup Java (temurin@8)
         if: matrix.java == 'temurin@8'
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: 8
           cache: sbt
 
       - name: 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
           cache: sbt
 
       - name: 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
           cache: sbt
 
-      - name: Download target directories (2.12.18)
-        uses: actions/download-artifact@v3
+      - name: Setup Java (temurin@21)
+        if: matrix.java == 'temurin@21'
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 21
+          cache: sbt
+
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+
+      - name: Download target directories (2.12.20)
+        uses: actions/download-artifact@v4
         with:
-          name: target-${{ matrix.os }}-2.12.18-${{ matrix.java }}
+          name: target-${{ matrix.os }}-2.12.20-${{ matrix.java }}
 
-      - name: Inflate target directories (2.12.18)
+      - name: Inflate target directories (2.12.20)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (2.13.11)
-        uses: actions/download-artifact@v3
+      - name: Download target directories (2.13.15)
+        uses: actions/download-artifact@v4
         with:
-          name: target-${{ matrix.os }}-2.13.11-${{ matrix.java }}
+          name: target-${{ matrix.os }}-2.13.15-${{ matrix.java }}
 
-      - name: Inflate target directories (2.13.11)
+      - name: Inflate target directories (2.13.15)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.3.0)
-        uses: actions/download-artifact@v3
+      - name: Download target directories (3.3.3)
+        uses: actions/download-artifact@v4
         with:
-          name: target-${{ matrix.os }}-3.3.0-${{ matrix.java }}
+          name: target-${{ matrix.os }}-3.3.3-${{ matrix.java }}
 
-      - name: Inflate target directories (3.3.0)
+      - name: Inflate target directories (3.3.3)
         run: |
           tar xf targets.tar
           rm targets.tar

.github/workflows/clean.yml

@@ -17,6 +17,7 @@ jobs:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: Delete artifacts
+        shell: bash {0}
         run: |
           # Customize those three lines with your repository and credentials:
           REPO=${GITHUB_API_URL}/repos/${{ github.repository }}
@@ -25,7 +26,7 @@ jobs:
           ghapi() { curl --silent --location --user _:$GITHUB_TOKEN "$@"; }
 
           # A temporary file which receives HTTP response headers.
-          TMPFILE=/tmp/tmp.$$
+          TMPFILE=$(mktemp)
 
           # An associative array, key: artifact name, value: number of artifacts of that name.
           declare -A ARTCOUNT

.github/workflows/format.yml

@@ -18,7 +18,6 @@ jobs:
           persist-credentials: false
 
       - name: Check project is formatted
-        uses: jrouly/scalafmt-native-action@v2
+        uses: jrouly/scalafmt-native-action@v3
         with:
-          version: '3.7.11'
           arguments: '--list --mode diff-ref=origin/main'

.scala-steward.conf

@@ -1 +1,5 @@
 updatePullRequests = "always"
+
+updates.pin = [
+  { groupId = "org.scala-lang", artifactId = "scala3-library", version = "3.3." }
+]

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = 3.7.11
+version = 3.8.3
 runner.dialect = scala213
 preset = default
 align.preset = more

README.md

@@ -7,7 +7,7 @@
 # Pekko Streams Circe Support
 
 This library provides Json support for stream based applications using [jawn](https://github.com/non/jawn)
-as a parser. It supports all backends that jawn supports with support for [circe](https://github.com/travisbrown/circe) provided as a example.
+as a parser. It supports all backends that jawn supports with support for [circe](https://github.com/travisbrown/circe) provided as an example.
 
 It is a fork of [akka-streams-json](https://github.com/mdedetrich/akka-streams-json) built with [Apache Pekko](https://pekko.apache.org/).
 [akka-streams-json](https://github.com/mdedetrich/akka-streams-json) which is in itself a fork of
@@ -36,13 +36,13 @@ The parser lives at `org.mdedetrich.pekko.json.stream.JsonStreamParser`
 Use one of the constructor methods in the companion object to create the parser at
 various levels of abstraction, either a Stage, a Flow, or a Sink.
 You just add the [jawn support facade](https://github.com/non/jawn#supporting-external-asts-with-jawn)
-of your choice and you will can parsed into their respective Json AST.
+of your choice, and you will can parsed into their respective Json AST.
 
 
 For Http support, either `import org.mdedetrich.pekko.http.JsonSupport._`
 or mixin `... with org.mdedetrich.pekko.http.JsonSupport`.
 
-Given an implicit jawn facade, this enable you to decode into the respective Json AST
+Given an implicit jawn facade, this enables you to decode into the respective Json AST
 using the Pekko HTTP marshalling framework. As jawn is only about parsing and does not abstract
 over rendering, you'll only get an Unmarshaller.
 
@@ -63,7 +63,7 @@ Adding support for a specific framework is
 [easy](support/http-circe/src/main/scala/org/mdedetrich/pekko/http/support/CirceHttpSupport.scala).
 
 These support modules allow you to directly marshall from/unmarshall into your data types
-using circes `Decoder` and `Encoder` type classes.
+using circe's `Decoder` and `Encoder` type classes.
 
 Just mixin or import `org.mdedetrich.pekko.http.support.CirceHttpSupport` for Http
 or pipe your `Source[ByteString, _].via(org.mdedetrich.pekko.stream.CirceStreamSupport.decode[A])`
@@ -77,11 +77,9 @@ The exception provides Circe cursor history, current cursor and the type hint of
 
 ## Why jawn?
 
-Jawn provides a nice interface for asynchronous parsing.
-Most other Json marshalling provider will consume the complete entity
-at first, convert it to a string and then start to parse.
-With jawn, the json is incrementally parsed with each arriving data chunk,
-using directly the underlying ByteBuffers without conversion.
+Jawn provides a nice interface for asynchronous parsing. Most other Json marshalling provider will consume the complete
+entity at first, convert it to a string and then start to parse. With jawn, the json is incrementally parsed with
+each arriving data chunk, using directly the underlying ByteBuffers without conversion.
 
 ## License
 

build.sbt

@@ -2,20 +2,21 @@ import com.jsuereth.sbtpgp.PgpKeys.publishSigned
 
 name := "pekko-streams-circe"
 
-val scala213Version = "2.13.11"
-val scala212Version = "2.12.18"
-val scala3Version   = "3.3.0"
-
-val circeVersion     = "0.14.5"
-val pekkoVersion     = "1.0.1"
-val pekkoHttpVersion = "1.0.0"
-val jawnVersion      = "1.5.1"
-val scalaTestVersion = "3.2.16"
-
-ThisBuild / crossScalaVersions := Seq(scala212Version, scala213Version, scala3Version)
-ThisBuild / scalaVersion       := scala213Version
-ThisBuild / organization       := "org.mdedetrich"
-ThisBuild / versionScheme      := Some(VersionScheme.EarlySemVer)
+val scala213Version = "2.13.15"
+val scala212Version = "2.12.20"
+val scala3Version   = "3.3.3"
+
+val circeVersion     = "0.14.10"
+val pekkoVersion     = "1.0.3"
+val pekkoHttpVersion = "1.0.1"
+val jawnVersion      = "1.6.0"
+val scalaTestVersion = "3.2.19"
+
+ThisBuild / crossScalaVersions     := Seq(scala212Version, scala213Version, scala3Version)
+ThisBuild / scalaVersion           := scala213Version
+ThisBuild / organization           := "org.mdedetrich"
+ThisBuild / versionScheme          := Some(VersionScheme.EarlySemVer)
+ThisBuild / versionPolicyIntention := Compatibility.BinaryCompatible
 
 lazy val streamJson = project
   .in(file("stream-json"))
@@ -98,10 +99,6 @@ ThisBuild / scalacOptions ++= Seq(
   "-language:postfixOps"
 )
 
-Defaults.itSettings
-
-configs(IntegrationTest)
-
 ThisBuild / homepage := Some(url("https://github.com/mdedetrich/pekko-streams-circe"))
 
 ThisBuild / scmInfo := Some(
@@ -145,22 +142,24 @@ val flagsFor13 = Seq(
 val flagsFor3 = Seq.empty
 
 ThisBuild / scalacOptions ++= {
-  CrossVersion.partialVersion(scalaVersion.value) match {
-    case Some((2, n)) if n == 13 =>
-      flagsFor13
-    case Some((2, n)) if n == 12 =>
-      flagsFor12
-    case Some((3, _)) =>
-      Seq.empty
-  }
+  if (insideCI.value) {
+    val log = sLog.value
+    log.info("Running in CI, enabling Scala2 optimizer")
+    CrossVersion.partialVersion(scalaVersion.value) match {
+      case Some((2, n)) if n == 13 =>
+        flagsFor13
+      case Some((2, n)) if n == 12 =>
+        flagsFor12
+      case Some((3, _)) =>
+        Seq.empty
+    }
+  } else Seq.empty
 }
 
-IntegrationTest / parallelExecution := false
-
 ThisBuild / githubWorkflowTargetBranches := Seq("main") // Once we have branches per version, add the pattern here
 
 ThisBuild / githubWorkflowBuild := Seq(
-  WorkflowStep.Sbt(List("mimaReportBinaryIssues"), name = Some("Report binary compatibility issues")),
+  WorkflowStep.Sbt(List("versionPolicyCheck"), name = Some("Report version policy issues")),
   WorkflowStep.Sbt(List("clean", "coverage", "test"), name = Some("Build project"))
 )
 
@@ -200,8 +199,25 @@ ThisBuild / githubWorkflowPublishTargetBranches :=
     RefPredicate.Equals(Ref.Branch("main"))
   )
 
+ThisBuild / githubWorkflowOSes := Seq("ubuntu-latest", "macos-12", "macos-latest")
+
 ThisBuild / githubWorkflowJavaVersions := List(
   JavaSpec.temurin("8"),
   JavaSpec.temurin("11"),
-  JavaSpec.temurin("17")
+  JavaSpec.temurin("17"),
+  JavaSpec.temurin("21")
+)
+
+ThisBuild / githubWorkflowBuildMatrixExclusions +=
+  MatrixExclude(Map("java" -> "temurin@8", "os" -> "macos-latest"))
+
+// GitHub Actions macOS 13+ runner images do not come with sbt preinstalled anymore
+ThisBuild / githubWorkflowBuildPreamble ++= Seq(
+  WorkflowStep.Run(
+    commands = List(
+      "brew install sbt"
+    ),
+    cond = Some("matrix.os == 'macos-latest'"),
+    name = Some("Install sbt")
+  )
 )