Merge branch 'master' into patch-1

Author: juliano

.git-blame-ignore-revs

@@ -1,2 +1,5 @@
 # Scala Steward: Reformat with scalafmt 3.7.5
 d8a77dfb017feae820e38eea0d7b5128b13a737d
+
+# Scala Steward: Reformat with scalafmt 3.8.3
+1b7c658737faa53ec506fb403892320773282488

.github/workflows/ci.yml

@@ -15,6 +15,28 @@ env:
   JDK_JAVA_OPTIONS: -Xms6G -Xmx6G -XX:+UseG1GC --add-exports java.base/sun.nio.ch=ALL-UNNAMED
 
 jobs:
+  scalafmt:
+    timeout-minutes: 15
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/[email protected]
+      - name: Cache sbt
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cache/coursier
+            ~/.sbt
+          key: ${{ runner.os }}-${{matrix.scala}}-${{matrix.module}}-${{ hashFiles('**/build.sbt') }}
+
+      - name: Setup Java
+        uses: actions/[email protected]
+        with:
+          distribution: temurin
+          java-version: '17'
+          check-latest: true
+      - name: Check scalafmt
+        run: sbt 'scalafmtCheckAll' # https://scalameta.org/scalafmt/docs/installation.html#task-keys
+
   build:
     runs-on: ubuntu-latest
 
@@ -55,17 +77,17 @@ jobs:
     name: Build ${{matrix.scala_short_dot}} - ${{matrix.module}}
 
     steps:
-    - uses: actions/checkout@v4.0.0
+    - uses: actions/checkout@v4.2.2
     - name: Cache sbt
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           ~/.cache/coursier
           ~/.sbt
         key: ${{ runner.os }}-${{matrix.scala}}-${{matrix.module}}-${{ hashFiles('**/build.sbt') }}
 
-    - name: Setup Java and Scala
-      uses: actions/setup-java@v3.12.0
+    - name: Setup Java
+      uses: actions/setup-java@v4.5.0
       with:
         distribution: temurin
         java-version: '17'
@@ -86,12 +108,12 @@ jobs:
       CI_RELEASE: publishSigned # By default, sbt-ci-release uses the `+publishSigned` which is publishing for all the Scala versions configured, which is not what we want
       CI_SNAPSHOT_RELEASE: publish # By default, sbt-ci-release uses the `+publish` which is publishing for all the Scala versions configured, which is not what we want
     steps:
-      - uses: actions/checkout@v4.0.0
-      - name: Setup Java and Scala
-        uses: actions/setup-java@v3.12.0
+      - uses: actions/checkout@v4.2.2
+      - name: Setup Java
+        uses: actions/setup-java@v4.5.0
         with:
           distribution: temurin
-          java-version: '17'
+          java-version: '11'
           check-latest: true
       - run: |
           sbt ++2.12.x -Dquill.scala.version=2.12.x -Dquill.macro.log=false ci-release
@@ -100,5 +122,5 @@ jobs:
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
           PGP_SECRET: ${{ secrets.PGP_SECRET }}
-          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          SONATYPE_PASSWORD: ${{ secrets.GETQUILL_SONATYPE_TOKEN_PASSWORD }}
+          SONATYPE_USERNAME: ${{ secrets.GETQUILL_SONATYPE_TOKEN_USER }}

.github/workflows/release-drafter.yml

@@ -8,6 +8,6 @@ jobs:
   update_release_draft:
     runs-on: ubuntu-20.04
     steps:
-      - uses: release-drafter/release-drafter@v5
+      - uses: release-drafter/release-drafter@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/scala-steward.yml

@@ -13,7 +13,7 @@ jobs:
     name: Scala Steward
     steps:
       - name: Scala Steward
-        uses: scala-steward-org/scala-steward-action@v2.61.0
+        uses: scala-steward-org/scala-steward-action@v2.71.0
         with:
           github-app-id: ${{ secrets.SCALA_STEWARD_GITHUB_APP_ID }}
           github-app-installation-id: ${{ secrets.SCALA_STEWARD_GITHUB_APP_INSTALLATION_ID }}

.github/workflows/site.yml

@@ -18,11 +18,11 @@ jobs:
     if: ${{ github.event_name == 'pull_request' }}
     steps:
     - name: Git Checkout
-      uses: actions/checkout@v3.3.0
+      uses: actions/checkout@v4.2.2
       with:
         fetch-depth: '0'
     - name: Setup Scala
-      uses: actions/setup-java@v3.9.0
+      uses: actions/setup-java@v4.5.0
       with:
         distribution: temurin
         java-version: 17
@@ -39,11 +39,11 @@ jobs:
     if: ${{ ((github.event_name == 'release') && (github.event.action == 'published')) || (github.event_name == 'workflow_dispatch') }}
     steps:
     - name: Git Checkout
-      uses: actions/checkout@v3.3.0
+      uses: actions/checkout@v4.2.2
       with:
         fetch-depth: '0'
     - name: Setup Scala
-      uses: actions/setup-java@v3.9.0
+      uses: actions/setup-java@v4.5.0
       with:
         distribution: temurin
         java-version: 17
@@ -63,12 +63,12 @@ jobs:
     if: ${{ (github.event_name == 'push') || ((github.event_name == 'release') && (github.event.action == 'published')) }}
     steps:
     - name: Git Checkout
-      uses: actions/checkout@v3.3.0
+      uses: actions/checkout@v4.2.2
       with:
         ref: ${{ github.head_ref }}
         fetch-depth: '0'
     - name: Setup Scala
-      uses: actions/setup-java@v3.9.0
+      uses: actions/setup-java@v4.5.0
       with:
         distribution: temurin
         java-version: 17
@@ -82,7 +82,7 @@ jobs:
         git add README.md
         git commit -m "Update README.md" || echo "No changes to commit"
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v4.2.3
+      uses: peter-evans/create-pull-request@v7.0.5
       with:
         body: |-
           Autogenerated changes after running the `sbt docs/generateReadme` command of the [zio-sbt-website](https://zio.dev/zio-sbt) plugin.

.scalafmt.conf

@@ -1,19 +1,26 @@
-version = "3.7.14"
-maxColumn = 120
+version = "3.8.3"
+maxColumn = 240
 align.preset = most
 align.multiline = false
 continuationIndent.defnSite = 2
 assumeStandardLibraryStripMargin = true
 docstrings.style = Asterisk
 docstrings.wrapMaxColumn = 80
 lineEndings = preserve
-includeCurlyBraceInSelectChains = false
 danglingParentheses.preset = true
 optIn.annotationNewlines = true
 newlines.alwaysBeforeMultilineDef = false
 runner.dialect = scala213
 rewrite.rules = [RedundantBraces]
 
+# If I've inserted extra newlines I know what I'm doing, don't wrap them back.
+newlines.source = keep
+
+# Don't change braces in one-liners to parens e.g. don't change this: `test("foo") { assertEquals(x,y) }`
+# to this `test("foo")(assertEquals(x,y))`. The `rewrite.rules = [RedundantBraces]` will introduce this behavior
+# unless you add the below option.
+rewrite.redundantBraces.parensForOneLineApply = false
+
 project.excludePaths = ["glob:**/scalafix/input/**", "glob:**/scalafix/output/**"]
 
 rewrite.redundantBraces.generalExpressions = false