Merge branch 'master' into series/2.x

.github/workflows/ci.yml

@@ -25,24 +25,32 @@ jobs:
         uses: actions/[email protected]
         with:
           fetch-depth: 0
-      - name: Setup Scala and Java
-        uses: olafurpg/setup-scala@v13
+      - name: Setup Java
+        uses: actions/[email protected]
+        with:
+          distribution: temurin
+          java-version: 17
+          check-latest: true
       - name: Cache scala dependencies
         uses: coursier/cache-action@v6
       - name: Lint code
         run: ./sbt check
 
-  mdoc:
+  website:
     runs-on: ubuntu-20.04
     timeout-minutes: 60
     steps:
       - name: Checkout current branch
         uses: actions/[email protected]
-      - name: Setup Scala and Java
-        uses: olafurpg/setup-scala@v13
+      - name: Setup Java
+        uses: actions/[email protected]
+        with:
+          distribution: temurin
+          java-version: 17
+          check-latest: true
       - name: Cache scala dependencies
         uses: coursier/cache-action@v6
-      - name: Check Document Generation
+      - name: Check Website Generation
         run: ./sbt docs/docusaurusCreateSite
 
   test:
@@ -51,17 +59,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: ['adopt@1.8', '[email protected]']
+        java: ['8', '11', '17']
         scala: ['2.12.15', '2.13.8', '3.1.0']
     steps:
       - name: Checkout current branch
         uses: actions/[email protected]
         with:
           fetch-depth: 0
-      - name: Setup Scala and Java
-        uses: olafurpg/setup-scala@v13
+      - name: Setup Java
+        uses: actions/setup-[email protected]
         with:
+          distribution: temurin
           java-version: ${{ matrix.java }}
+          check-latest: true
       - name: Cache scala dependencies
         uses: coursier/cache-action@v6
       - name: Run tests
@@ -70,9 +80,26 @@ jobs:
         if: ${{ startsWith(matrix.scala, '2') }}
         run: ./sbt ++${{ matrix.scala }}! compileExamples
 
+  publishLocal:
+    runs-on: ubuntu-20.04
+    timeout-minutes: 30
+    steps:
+      - name: Checkout current branch
+        uses: actions/[email protected]
+      - name: Setup Java
+        uses: actions/[email protected]
+        with:
+          distribution: temurin
+          java-version: 8
+          check-latest: true
+      - name: Cache scala dependencies
+        uses: coursier/cache-action@v6
+      - name: Check that building packages works
+        run: ./sbt +publishLocal
+
   ci:
     runs-on: ubuntu-20.04
-    needs: [lint, test]
+    needs: [lint, test, publishLocal, website]
     steps:
       - name: Aggregate job outcomes
         run: echo "build succeeds"
@@ -87,8 +114,12 @@ jobs:
         uses: actions/[email protected]
         with:
           fetch-depth: 0
-      - name: Setup Scala and Java
-        uses: olafurpg/setup-scala@v13
+      - name: Setup Java
+        uses: actions/[email protected]
+        with:
+          distribution: temurin
+          java-version: 8
+          check-latest: true
       - name: Cache scala dependencies
         uses: coursier/cache-action@v6
       - name: Release artifacts

.github/workflows/site.yml

@@ -2,7 +2,9 @@ name: Website
 
 on:
   push:
-    branches: [master]
+    branches: 
+      - 'master'
+      - 'series/2.x'
   release:
     types:
       - published
@@ -11,10 +13,16 @@ jobs:
   publish:
     runs-on: ubuntu-20.04
     timeout-minutes: 30
-    if: github.event_name != 'pull_request'
     steps:
-      - uses: actions/checkout@v2
-      - uses: olafurpg/setup-scala@v13
-      - run: sbt docs/docusaurusPublishGhpages
+      - name: Checkout current branch
+        uses: actions/checkout@v2
+      - name: Setup Java
+        uses: actions/[email protected]
+        with:
+          distribution: temurin
+          java-version: 17
+          check-latest: true
+      - name: Publish the site
+        run: ./sbt docs/docusaurusPublishGhpages
         env:
-          GIT_DEPLOY_KEY: ${{ secrets.GIT_DEPLOY_KEY }}
+          GIT_DEPLOY_KEY: ${{ secrets.GIT_DEPLOY_KEY }}

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = "3.2.2"
+version = "3.4.2"
 maxColumn = 120
 align.preset = most
 continuationIndent.defnSite = 2