diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1089504..4bafaa5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04] - scala: [2.12, 2.13, 3] + scala: [2.12.21, 3.9.0, 3.3.7] java: [temurin@8] project: [disciplineNative, disciplineJS, disciplineJVM] runs-on: ${{ matrix.os }} @@ -127,92 +127,92 @@ jobs: if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' run: sbt +update - - name: Download target directories (2.12, disciplineNative) + - name: Download target directories (2.12.21, disciplineNative) uses: actions/download-artifact@v6 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-disciplineNative + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.21-disciplineNative - - name: Inflate target directories (2.12, disciplineNative) + - name: Inflate target directories (2.12.21, disciplineNative) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.12, disciplineJS) + - name: Download target directories (2.12.21, disciplineJS) uses: actions/download-artifact@v6 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-disciplineJS + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.21-disciplineJS - - name: Inflate target directories (2.12, disciplineJS) + - name: Inflate target directories (2.12.21, disciplineJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.12, disciplineJVM) + - name: Download target directories (2.12.21, disciplineJVM) uses: actions/download-artifact@v6 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-disciplineJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.21-disciplineJVM - - name: Inflate target directories (2.12, disciplineJVM) + - name: Inflate target directories (2.12.21, disciplineJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13, disciplineNative) + - name: Download target directories (3.9.0, disciplineNative) uses: actions/download-artifact@v6 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-disciplineNative + name: target-${{ matrix.os }}-${{ matrix.java }}-3.9.0-disciplineNative - - name: Inflate target directories (2.13, disciplineNative) + - name: Inflate target directories (3.9.0, disciplineNative) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13, disciplineJS) + - name: Download target directories (3.9.0, disciplineJS) uses: actions/download-artifact@v6 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-disciplineJS + name: target-${{ matrix.os }}-${{ matrix.java }}-3.9.0-disciplineJS - - name: Inflate target directories (2.13, disciplineJS) + - name: Inflate target directories (3.9.0, disciplineJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13, disciplineJVM) + - name: Download target directories (3.9.0, disciplineJVM) uses: actions/download-artifact@v6 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-disciplineJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-3.9.0-disciplineJVM - - name: Inflate target directories (2.13, disciplineJVM) + - name: Inflate target directories (3.9.0, disciplineJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3, disciplineNative) + - name: Download target directories (3.3.7, disciplineNative) uses: actions/download-artifact@v6 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3-disciplineNative + name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.7-disciplineNative - - name: Inflate target directories (3, disciplineNative) + - name: Inflate target directories (3.3.7, disciplineNative) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3, disciplineJS) + - name: Download target directories (3.3.7, disciplineJS) uses: actions/download-artifact@v6 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3-disciplineJS + name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.7-disciplineJS - - name: Inflate target directories (3, disciplineJS) + - name: Inflate target directories (3.3.7, disciplineJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3, disciplineJVM) + - name: Download target directories (3.3.7, disciplineJVM) uses: actions/download-artifact@v6 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3-disciplineJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.7-disciplineJVM - - name: Inflate target directories (3, disciplineJVM) + - name: Inflate target directories (3.3.7, disciplineJVM) run: | tar xf targets.tar rm targets.tar @@ -274,5 +274,5 @@ jobs: - name: Submit Dependencies uses: scalacenter/sbt-dependency-submission@v2 with: - modules-ignore: disciplinenative_2.12 disciplinenative_2.13 disciplinenative_3 disciplinejs_2.12 disciplinejs_2.13 disciplinejs_3 disciplinejvm_2.12 disciplinejvm_2.13 disciplinejvm_3 + modules-ignore: disciplinenative_2.12 disciplinenative_3 disciplinenative_3 disciplinejs_2.12 disciplinejs_3 disciplinejs_3 disciplinejvm_2.12 disciplinejvm_3 disciplinejvm_3 configs-ignore: test scala-tool scala-doc-tool test-internal diff --git a/.mergify.yml b/.mergify.yml index 8e66f7b..84e717d 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -10,15 +10,15 @@ pull_request_rules: conditions: - author=scala-steward - body~=labels:.*early-semver-patch - - status-success=Test (ubuntu-22.04, 2.12, temurin@8, disciplineNative) - - status-success=Test (ubuntu-22.04, 2.12, temurin@8, disciplineJS) - - status-success=Test (ubuntu-22.04, 2.12, temurin@8, disciplineJVM) - - status-success=Test (ubuntu-22.04, 2.13, temurin@8, disciplineNative) - - status-success=Test (ubuntu-22.04, 2.13, temurin@8, disciplineJS) - - status-success=Test (ubuntu-22.04, 2.13, temurin@8, disciplineJVM) - - status-success=Test (ubuntu-22.04, 3, temurin@8, disciplineNative) - - status-success=Test (ubuntu-22.04, 3, temurin@8, disciplineJS) - - status-success=Test (ubuntu-22.04, 3, temurin@8, disciplineJVM) + - status-success=Test (ubuntu-22.04, 2.12.21, temurin@8, disciplineNative) + - status-success=Test (ubuntu-22.04, 2.12.21, temurin@8, disciplineJS) + - status-success=Test (ubuntu-22.04, 2.12.21, temurin@8, disciplineJVM) + - status-success=Test (ubuntu-22.04, 3.9.0, temurin@8, disciplineNative) + - status-success=Test (ubuntu-22.04, 3.9.0, temurin@8, disciplineJS) + - status-success=Test (ubuntu-22.04, 3.9.0, temurin@8, disciplineJVM) + - status-success=Test (ubuntu-22.04, 3.3.7, temurin@8, disciplineNative) + - status-success=Test (ubuntu-22.04, 3.3.7, temurin@8, disciplineJS) + - status-success=Test (ubuntu-22.04, 3.3.7, temurin@8, disciplineJVM) actions: merge: {} - name: Label core PRs diff --git a/build.sbt b/build.sbt index 9c87302..a58d22c 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ ThisBuild / developers := List( tlGitHubDev("larsrh", "Lars Hupel") ) -ThisBuild / crossScalaVersions := Seq("2.12.21", "2.13.18", "3.3.7") +ThisBuild / crossScalaVersions := Seq("2.12.21", "3.9.0", "3.3.7") ThisBuild / tlVersionIntroduced := Map("3" -> "1.1.5") ThisBuild / licenses := Seq("MIT" -> url("https://opensource.org/licenses/MIT"))