Merge pull request #481 from Atry/merge-from-1.x

Dsl.scala 2.0 for Scala 3

.github/workflows/scala.yml

@@ -33,12 +33,13 @@ jobs:
           ~/.sbt/
           ~/.coursier/
         key: |
-          ${{ runner.os }}-${{matrix.scala}}-${{ hashFiles('**/*.sbt') }}
-          ${{ runner.os }}-${{matrix.scala}}-
+          ${{runner.os}}-${{matrix.scala}}-${{hashFiles('**/*.sbt')}}-${{matrix.sbt-args}}
+          ${{runner.os}}-${{matrix.scala}}-${{hashFiles('**/*.sbt')}}-
+          ${{runner.os}}-${{matrix.scala}}-
     - name: Run tests
-      run: sbt ++${{ matrix.scala }} test
+      run: sbt ${{matrix.sbt-args}} ++${{ matrix.scala }} test
     - name: Publish to Maven Central Repository
       env:
         GITHUB_PERSONAL_ACCESS_TOKEN: ${{secrets.PERSONAL_ACCESS_TOKEN}}
       if: ${{ env.GITHUB_PERSONAL_ACCESS_TOKEN != '' }}
-      run: sbt ++${{ matrix.scala }} "set every Seq(sonatypeSessionName := \"${{github.workflow}} ${{github.run_id}}-${{github.run_number}}-${{github.run_attempt}}-$$ ${{ matrix.scala }}\", publishTo := sonatypePublishToBundle.value)" publishSigned sonatypeBundleRelease
+      run: sbt ${{matrix.sbt-args}} ++${{matrix.scala}} "set every Seq(sonatypeSessionName := \"${{github.workflow}} ${{github.run_id}}-${{github.run_number}}-${{github.run_attempt}}-$$ ${{ matrix.scala }}\", publishTo := sonatypePublishToBundle.value)" publishSigned sonatypeBundleRelease

.sbtopts

@@ -1,3 +1,4 @@
 -J-XX:MaxMetaspaceSize=512M
 -J-Xmx5G
 -J-Xss6M
+-J-XX:+UseG1GC

.scalafmt.conf

@@ -1,3 +1,3 @@
 runner.dialect = "scala3"
-version = "3.1.1"
+version = "3.1.2"
 maxColumn = 120

Dsl/.js/build.sbt

@@ -0,0 +1 @@
+../build.sbt

Dsl/.jvm/build.sbt

@@ -0,0 +1 @@
+../build.sbt