Release 3.0

.github/workflows/ci.yml

@@ -15,76 +15,59 @@ on:
     tags: [v*]
 
 env:
-  PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
-  SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-  SONATYPE_CREDENTIAL_HOST: ${{ secrets.SONATYPE_CREDENTIAL_HOST }}
-  SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-  PGP_SECRET: ${{ secrets.PGP_SECRET }}
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+
+concurrency:
+  group: ${{ github.workflow }} @ ${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: Build and Test
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.17, 2.13.10, 3.2.2]
+        scala: [2.12, 2.13, 3]
         java: [temurin@8, temurin@17]
         exclude:
-          - scala: 2.12.17
+          - scala: 2.12
             java: temurin@17
-          - scala: 3.2.2
+          - scala: 3
             java: temurin@17
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 60
     steps:
       - name: Checkout current branch (full)
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Download Java (temurin@8)
-        id: download-java-temurin-8
-        if: matrix.java == 'temurin@8'
-        uses: typelevel/download-java@v2
-        with:
-          distribution: temurin
-          java-version: 8
-
       - name: Setup Java (temurin@8)
+        id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
         uses: actions/setup-java@v3
         with:
-          distribution: jdkfile
+          distribution: temurin
           java-version: 8
-          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
+          cache: sbt
 
-      - name: Download Java (temurin@17)
-        id: download-java-temurin-17
-        if: matrix.java == 'temurin@17'
-        uses: typelevel/download-java@v2
-        with:
-          distribution: temurin
-          java-version: 17
+      - name: sbt update
+        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        run: sbt +update
 
       - name: Setup Java (temurin@17)
+        id: setup-java-temurin-17
         if: matrix.java == 'temurin@17'
         uses: actions/setup-java@v3
         with:
-          distribution: jdkfile
+          distribution: temurin
           java-version: 17
-          jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }}
+          cache: sbt
 
-      - name: Cache sbt
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.coursier/cache/v1
-            ~/.cache/coursier/v1
-            ~/AppData/Local/Coursier/Cache/v1
-            ~/Library/Caches/Coursier/v1
-          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+      - name: sbt update
+        if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
+        run: sbt +update
 
       - name: Check that workflows are up to date
         run: sbt githubWorkflowCheck
@@ -101,65 +84,52 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.10]
         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: Download Java (temurin@8)
-        id: download-java-temurin-8
-        if: matrix.java == 'temurin@8'
-        uses: typelevel/download-java@v2
-        with:
-          distribution: temurin
-          java-version: 8
-
       - name: Setup Java (temurin@8)
+        id: setup-java-temurin-8
         if: matrix.java == 'temurin@8'
         uses: actions/setup-java@v3
         with:
-          distribution: jdkfile
+          distribution: temurin
           java-version: 8
-          jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
+          cache: sbt
 
-      - name: Download Java (temurin@17)
-        id: download-java-temurin-17
-        if: matrix.java == 'temurin@17'
-        uses: typelevel/download-java@v2
-        with:
-          distribution: temurin
-          java-version: 17
+      - name: sbt update
+        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        run: sbt +update
 
       - name: Setup Java (temurin@17)
+        id: setup-java-temurin-17
         if: matrix.java == 'temurin@17'
         uses: actions/setup-java@v3
         with:
-          distribution: jdkfile
+          distribution: temurin
           java-version: 17
-          jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }}
+          cache: sbt
 
-      - name: Cache sbt
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.coursier/cache/v1
-            ~/.cache/coursier/v1
-            ~/AppData/Local/Coursier/Cache/v1
-            ~/Library/Caches/Coursier/v1
-          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
+      - name: sbt update
+        if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
+        run: sbt +update
 
       - name: Import signing key
         if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == ''
+        env:
+          PGP_SECRET: ${{ secrets.PGP_SECRET }}
+          PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
         run: echo $PGP_SECRET | base64 -di | 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_PASSPHRASE" | gpg --pinentry-mode loopback --passphrase-fd 0 --import /tmp/signing-key.gpg
@@ -171,35 +141,71 @@ jobs:
           GIT_DEPLOY_KEY: ${{ secrets.GIT_DEPLOY_KEY }}
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
           PGP_SECRET: ${{ secrets.PGP_SECRET }}
-        run: sbt '++ ${{ matrix.scala }}' tlRelease docs/docusaurusPublishGhpages
+        run: sbt tlRelease docs/docusaurusPublishGhpages
 
-  validate-steward:
-    name: Validate Steward Config
+  dependency-submission:
+    name: Submit Dependencies
+    if: github.event_name != 'pull_request'
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.6]
-        java: [temurin@11]
+        java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Checkout current branch (fast)
-        uses: actions/checkout@v3
+      - name: Checkout current branch (full)
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
-      - name: Download Java (temurin@17)
-        id: download-java-temurin-17
-        if: matrix.java == 'temurin@17'
-        uses: typelevel/download-java@v2
+      - name: Setup Java (temurin@8)
+        id: setup-java-temurin-8
+        if: matrix.java == 'temurin@8'
+        uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 8
+          cache: sbt
+
+      - name: sbt update
+        if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
+        run: sbt +update
 
       - name: Setup Java (temurin@17)
+        id: setup-java-temurin-17
         if: matrix.java == 'temurin@17'
         uses: actions/setup-java@v3
         with:
-          distribution: jdkfile
+          distribution: temurin
           java-version: 17
-          jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }}
+          cache: sbt
+
+      - name: sbt update
+        if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
+        run: sbt +update
+
+      - name: Submit Dependencies
+        uses: scalacenter/sbt-dependency-submission@v2
+        with:
+          configs-ignore: test scala-tool scala-doc-tool test-internal
+
+  validate-steward:
+    name: Validate Steward Config
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        java: [temurin@11]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout current branch (fast)
+        uses: actions/checkout@v4
+
+      - name: Setup Java (temurin@11)
+        id: setup-java-temurin-11
+        if: matrix.java == 'temurin@11'
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 11
 
       - uses: coursier/setup-action@v1
         with:

.scala-steward.conf

@@ -1,24 +1,36 @@
 pullRequests.frequency = "14 days"
 
-updates.pin = [{
+updates.ignore = [{
+  groupId = "com.dimafeng"
+},{
+  groupId = "org.scalameta",
+  artifactId = "sbt-scalafmt"
+},{
+  groupId = "de.heikoseeberger",
+  artifactId = "sbt-header"
+},{
+  groupId = "org.scala-lang",
+  artifactId = "scala-library"
+},{
+  groupId = "org.scala-lang",
+  artifactId = "scala3-library"
+},{
+  groupId = "ch.qos.logback",
+  artifactId = "logback-classic"
+},{
   groupId = "org.typelevel",
-  artifactId="cats-effect",
-  version = "3."
-}, {
-  groupId = "co.fs2",
-  artifactId="fs2-core",
-  version = "3."
-}, {
+  artifactId = "discipline-scalatest"
+},{
+  groupId = "ch.qos.logback",
+  artifactId = "logback-classic"
+},{
+  groupId = "com.github.fd4s",
+  artifactId = "vulcan"
+}
+]
+
+updates.pin = [{
   groupId="org.apache.kafka",
   artifactId="kafka-clients",
-  version="2."
-}, { 
-  groupId = "io.confluent",
-  artifactId = "kafka-avro-serializer", 
-  version="6."
-}, {
-    groupId = "ch.qos.logback",
-    artifactId = ""logback-classic"",
-    version="1.3."
-  }
-]
+  version="3."
+}]

README.md

@@ -2,18 +2,18 @@
 
 [![Latest version](https://index.scala-lang.org/fd4s/fs2-kafka/fs2-kafka/latest.svg?style=flat)](https://index.scala-lang.org/fd4s/fs2-kafka/fs2-kafka)
 ![License](https://img.shields.io/github/license/fd4s/fs2-kafka)
-[![Gitter](https://img.shields.io/gitter/room/fd4s/fs2-kafka)](https://gitter.im/fd4s/fs2-kafka)
+[![Discord](https://img.shields.io/discord/632277896739946517.svg?label=&logo=discord&logoColor=ffffff&color=404244&labelColor=6A7EC2)](https://discord.com/channels/632277896739946517/908001544052563979)
 
 ## Getting started
 
 For the latest stable version, see the badge at the top of this page. If your project uses cats-effect 2 you should instead use the latest release from the 1.x series.
 
 ### Version matrix
-|fs2-kafka|scala|cats-effect/fs2|kafka-clients|
-|---------|-----|---------------|-------------|
-|3.x (milestones)|2.13, 3.1+|3.x|3.x|
-|2.x|2.12, 2.13, 3.1+|3.x|2.x|
-|1.x|2.12, 2.13, 3.0+|2.x|2.x|
+|fs2-kafka| scala            |cats-effect/fs2|kafka-clients|status|
+|---------|------------------|---------------|-------------|------|
+|3.x| 2.12, 2.13, 3.3+ |3.x|3.x|Current|
+|2.x| 2.12, 2.13, 3.2+ |3.x|2.x|End-of-life|
+|1.x| 2.12, 2.13, 3.2+ |2.x|2.x|End-of-life|
 
 For further details, see the [microsite](https://fd4s.github.io/fs2-kafka/docs/overview).
 
@@ -23,13 +23,14 @@ For further details, see the [microsite](https://fd4s.github.io/fs2-kafka/docs/o
 
 ## Contributing
 
-Pull requests and feedback are welcome. Pull requests should usually target the `series/2.x` branch
+Pull requests and feedback are welcome. Pull requests should usually target the `series/3.x` branch.
 
 ## Adopters
 
 FS2-Kafka is used in production by a number of companies, including:
 - [ITV](https://github.com/itv)
 - [OVO Energy](https://github.com/ovotech)
+- [Stuart](https://github.com/StuartApp)
 
 ## Code of conduct