Scala3 (#1375)

laserdisc-io · Jan 22, 2024 · fb1050e · fb1050e
1 parent 0fb7c5e
commit fb1050e
Show file tree

Hide file tree

Showing 13 changed files with 186 additions and 193 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -39,8 +39,8 @@ jobs:
     strategy:
       matrix:
         scala:
-          - 2.12.18
           - 2.13.12
+          - 3.3.1
         java:
           - adopt@1.11
           - adopt@1.15
@@ -70,9 +70,9 @@ jobs:
           key: ${{ runner.os }}-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
       - name: Test (${{ matrix.scala }}, ${{ matrix.java }})
         run: sbt ++${{ matrix.scala }} fullTest
-  publish_212:
+  publish_213:
     if: github.event_name == 'push' && github.ref == 'refs/heads/master'
-    name: Publish Snapshot 2.12
+    name: Publish Snapshot 2.13
     needs: build
     runs-on: ubuntu-20.04
     steps:
@@ -96,17 +96,17 @@ jobs:
             target
             project/target
           key: ${{ runner.os }}-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
-      - name: Publish Snapshot for Scala 2.12
-        run: CI_SNAPSHOT_RELEASE=publish sbt ++2.12.18 releaseIt
+      - name: Publish Snapshot for Scala 2.13
+        run: CI_SNAPSHOT_RELEASE=publish sbt ++2.13.12 releaseIt
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
           PGP_SECRET: ${{ secrets.PGP_SECRET }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-  publish_213:
+  publish_3:
     if: github.event_name == 'push' && github.ref == 'refs/heads/master'
-    name: Publish Snapshot 2.13
-    needs: publish_212
+    name: Publish Snapshot 3
+    needs: publish_213
     runs-on: ubuntu-20.04
     steps:
       - name: Branch Checkout
@@ -129,8 +129,8 @@ jobs:
             target
             project/target
           key: ${{ runner.os }}-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
-      - name: Publish Snapshot for Scala 2.13
-        run: CI_SNAPSHOT_RELEASE=publish sbt ++2.13.12 releaseIt
+      - name: Publish Snapshot for Scala 3
+        run: CI_SNAPSHOT_RELEASE=publish sbt ++3.3.1 releaseIt
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
           PGP_SECRET: ${{ secrets.PGP_SECRET }}

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -4,8 +4,8 @@ on:
     types:
       - created
 jobs:
-  release_212:
-    name: Release 2.12
+  release_213:
+    name: Release 2.13
     runs-on: ubuntu-20.04
     steps:
       - name: Branch Checkout
@@ -30,16 +30,16 @@ jobs:
             target
             project/target
           key: ${{ runner.os }}-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
-      - name: Release for Scala 2.12
-        run: CI_RELEASE=publishSigned sbt ++2.12.18 releaseIt
+      - name: Release for Scala 2.13
+        run: CI_RELEASE=publishSigned sbt ++2.13.12 releaseIt
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
           PGP_SECRET: ${{ secrets.PGP_SECRET }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-  release_213:
-    name: Release 2.13
-    needs: release_212
+  release_3:
+    name: Release 3
+    needs: release_213
     runs-on: ubuntu-20.04
     steps:
       - name: Branch Checkout
@@ -64,8 +64,8 @@ jobs:
             target
             project/target
           key: ${{ runner.os }}-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
-      - name: Release for Scala 2.13
-        run: CI_RELEASE=publishSigned sbt ++2.13.12 releaseIt
+      - name: Release for Scala 3
+        run: CI_RELEASE=publishSigned sbt ++3.3.1 releaseIt
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
           PGP_SECRET: ${{ secrets.PGP_SECRET }}