diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4eacec7..8d70310 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12, 2.13, 3] + scala: [2.13.15, 2.13.14, 3.5.1] java: [temurin@8] project: [rootJS, rootJVM] runs-on: ${{ matrix.os }} @@ -136,62 +136,62 @@ jobs: if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false' run: sbt +update - - name: Download target directories (2.12, rootJS) + - name: Download target directories (2.13.15, rootJS) uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.15-rootJS - - name: Inflate target directories (2.12, rootJS) + - name: Inflate target directories (2.13.15, rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.12, rootJVM) + - name: Download target directories (2.13.15, rootJVM) uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.15-rootJVM - - name: Inflate target directories (2.12, rootJVM) + - name: Inflate target directories (2.13.15, rootJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13, rootJS) + - name: Download target directories (2.13.14, rootJS) uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.14-rootJS - - name: Inflate target directories (2.13, rootJS) + - name: Inflate target directories (2.13.14, rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13, rootJVM) + - name: Download target directories (2.13.14, rootJVM) uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.14-rootJVM - - name: Inflate target directories (2.13, rootJVM) + - name: Inflate target directories (2.13.14, rootJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3, rootJS) + - name: Download target directories (3.5.1, rootJS) uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-3.5.1-rootJS - - name: Inflate target directories (3, rootJS) + - name: Inflate target directories (3.5.1, rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3, rootJVM) + - name: Download target directories (3.5.1, rootJVM) uses: actions/download-artifact@v4 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-3.5.1-rootJVM - - name: Inflate target directories (3, rootJVM) + - name: Inflate target directories (3.5.1, rootJVM) run: | tar xf targets.tar rm targets.tar @@ -254,7 +254,7 @@ jobs: - name: Submit Dependencies uses: scalacenter/sbt-dependency-submission@v2 with: - modules-ignore: rootjs_2.12 rootjs_2.13 rootjs_3 rootjvm_2.12 rootjvm_2.13 rootjvm_3 rootnative_2.12 rootnative_2.13 rootnative_3 readme_2.12 readme_2.13 + modules-ignore: rootjs_2.13 rootjs_2.13 rootjs_3 rootjvm_2.13 rootjvm_2.13 rootjvm_3 rootnative_2.13 rootnative_2.13 rootnative_3 readme_2.13 readme_2.13 configs-ignore: test scala-tool scala-doc-tool test-internal validate-steward: diff --git a/.mergify.yml b/.mergify.yml index 8d53589..68efc87 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -21,12 +21,12 @@ pull_request_rules: - or: - author=scala-steward - author=scala-steward[bot] - - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, rootJS) - - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, rootJVM) - - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8, rootJS) - - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8, rootJVM) - - status-success=Build and Test (ubuntu-latest, 3, temurin@8, rootJS) - - status-success=Build and Test (ubuntu-latest, 3, temurin@8, rootJVM) + - status-success=Build and Test (ubuntu-latest, 2.13.15, temurin@8, rootJS) + - status-success=Build and Test (ubuntu-latest, 2.13.15, temurin@8, rootJVM) + - status-success=Build and Test (ubuntu-latest, 2.13.14, temurin@8, rootJS) + - status-success=Build and Test (ubuntu-latest, 2.13.14, temurin@8, rootJVM) + - status-success=Build and Test (ubuntu-latest, 3.5.1, temurin@8, rootJS) + - status-success=Build and Test (ubuntu-latest, 3.5.1, temurin@8, rootJVM) actions: merge: method: merge diff --git a/build.sbt b/build.sbt index 9ec0fa9..5b9417c 100644 --- a/build.sbt +++ b/build.sbt @@ -6,7 +6,7 @@ val groupId = "eu.timepit" val projectName = "fs2-cron" val rootPkg = s"$groupId.${projectName.replace("-", "")}" -val Scala_2_12 = "2.12.20" +val Scala_2_12 = "2.13.15" val Scala_2_13 = "2.13.14" val Scala_3 = "3.5.1"