Cleanup cross building (#30981)

* wip

* Don't set crossScalaVersions at the toplevel

* scalafmtSbt

* Accidentally commited

* Set default scalaVersion

* Set top-level scala version to default

* Add comment explaining why to +~

.github/workflows/binary-compatibility-checks.yml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # The versions of scala specified here are only used as `-Dakka.build.scalaVersion=...`
+        # The versions of scala specified here are only used as `+~...`
         # which ignores the PATCH portion of the version id. These Scala versions don't need
         # to be fully defined here then since Akka build handles which patch version will be used.
         scalaVersion: [ "2.12", "2.13" ]
@@ -37,4 +37,4 @@ jobs:
         uses: coursier/cache-action@v6.2
 
       - name: Report MiMa Binary Issues
-        run: sbt -jvm-opts .jvmopts-ci -Dakka.build.scalaVersion=${{ matrix.scalaVersion }} mimaReportBinaryIssues
+        run: sbt -jvm-opts .jvmopts-ci "+~ ${{ matrix.scalaVersion }} mimaReportBinaryIssues"

.github/workflows/nightly-builds.yml

@@ -144,7 +144,6 @@ jobs:
         # note that this is not running any multi-jvm tests (yet) because multi-in-test=false
         run: |-
           sbt -jvm-opts .jvmopts-ci \
-            -Dakka.build.scalaVersion=${{ matrix.scalaVersion }} \
             -Dakka.cluster.assert=on \
             -Dakka.log.timestamps=true \
             -Dakka.test.timefactor=2 \
@@ -156,7 +155,7 @@ jobs:
             -Dmultinode.Xmx256M \
             -Dmultinode.XX:+AlwaysActAsServerClassMachine \
             ${{ matrix.extraOpts }} \
-            clean Test/compile test checkTestsHaveRun
+            "+~ ${{ matrix.scalaVersion }} clean Test/compile test checkTestsHaveRun"
 
       - name: Test Reports
         # Makes it easier to spot failures instead of looking at the logs.
@@ -175,16 +174,15 @@ jobs:
         run: |-
           sudo apt-get install graphviz
           sbt -jvm-opts .jvmopts-ci \
-            -Dakka.build.scalaVersion=${{ matrix.scalaVersion }} \
             -Dakka.genjavadoc.enabled=true \
-            doc
+            "+~ ${{ matrix.scalaVersion }} doc"
 
       - name: Publish
         run: |-
           sudo apt-get install graphviz
           sbt -jvm-opts .jvmopts-ci \
             -Dakka.build.scalaVersion=${{ matrix.scalaVersion }} \
-            publishLocal publishM2
+            "+~ ${{ matrix.scalaVersion }} publishLocal publishM2"
 
       - name: Email on failure
         if: ${{ failure() }}

.github/workflows/publish-docs.yml

@@ -33,6 +33,6 @@ jobs:
           chmod 600 /tmp/id_rsa
           ssh-add /tmp/id_rsa
           # using Scala 2.13 here to avoid the infamous problem with missing AskSupport in classpath
-          sbt -Dakka.build.scalaVersion=2.13.0 -Dakka.genjavadoc.enabled=true publishRsync
+          sbt -Dakka.genjavadoc.enabled=true "+~ 2.13 publishRsync"
         env:
           SCP_SECRET: ${{ secrets.SCP_SECRET }}

.github/workflows/scala3-build.yml

@@ -48,7 +48,6 @@ jobs:
         # note that this is not running any multi-jvm tests (yet) because multi-in-test=false
         run: |
           sbt -jvm-opts .jvmopts-ci \
-          -Dakka.build.scalaVersion=3.0 \
           -Dakka.log.timestamps=true \
           -Dakka.test.timefactor=2 \
           -Dakka.actor.testkit.typed.timefactor=2 \
@@ -59,4 +58,4 @@ jobs:
           -Dmultinode.Xmx256M \
           -Dmultinode.Xlog:gc \
           -Dmultinode.XX:+AlwaysActAsServerClassMachine \
-          ${{ matrix.command }}
+          "+~ 3 ${{ matrix.command }}"

.github/workflows/scala3-compile.yml

@@ -45,5 +45,4 @@ jobs:
       - name: Compile on Scala 3
         run: |
           sbt -jvm-opts .jvmopts-ci \
-          -Dakka.build.scalaVersion=3.0 \
-          ${{ matrix.command }}
+          "+~ 3 ${{ matrix.command }}"