diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d359b93e..2607e94f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04] - scala: [2.13, 3] + scala: [3.9.0, 3.3.8] java: [temurin@11] project: [rootJS, rootJVM, rootNative] runs-on: ${{ matrix.os }} @@ -151,62 +151,62 @@ jobs: if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false' run: sbt +update - - name: Download target directories (2.13, rootJS) + - name: Download target directories (3.9.0, rootJS) uses: actions/download-artifact@v6 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-3.9.0-rootJS - - name: Inflate target directories (2.13, rootJS) + - name: Inflate target directories (3.9.0, rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13, rootJVM) + - name: Download target directories (3.9.0, rootJVM) uses: actions/download-artifact@v6 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-3.9.0-rootJVM - - name: Inflate target directories (2.13, rootJVM) + - name: Inflate target directories (3.9.0, rootJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (2.13, rootNative) + - name: Download target directories (3.9.0, rootNative) uses: actions/download-artifact@v6 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootNative + name: target-${{ matrix.os }}-${{ matrix.java }}-3.9.0-rootNative - - name: Inflate target directories (2.13, rootNative) + - name: Inflate target directories (3.9.0, rootNative) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3, rootJS) + - name: Download target directories (3.3.8, rootJS) uses: actions/download-artifact@v6 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJS + name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.8-rootJS - - name: Inflate target directories (3, rootJS) + - name: Inflate target directories (3.3.8, rootJS) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3, rootJVM) + - name: Download target directories (3.3.8, rootJVM) uses: actions/download-artifact@v6 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJVM + name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.8-rootJVM - - name: Inflate target directories (3, rootJVM) + - name: Inflate target directories (3.3.8, rootJVM) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3, rootNative) + - name: Download target directories (3.3.8, rootNative) uses: actions/download-artifact@v6 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootNative + name: target-${{ matrix.os }}-${{ matrix.java }}-3.3.8-rootNative - - name: Inflate target directories (3, rootNative) + - name: Inflate target directories (3.3.8, rootNative) run: | tar xf targets.tar rm targets.tar @@ -281,7 +281,7 @@ jobs: - name: Submit Dependencies uses: scalacenter/sbt-dependency-submission@v2 with: - modules-ignore: grackle-demo_2.13 grackle-demo_3 benchmarks_2.13 benchmarks_3 rootjs_2.13 rootjs_3 docs_2.13 docs_3 buildinfo_native0.5_2.13 buildinfo_native0.5_3 buildinfo_sjs1_2.13 buildinfo_sjs1_3 profile_2.13 profile_3 rootjvm_2.13 rootjvm_3 rootnative_2.13 rootnative_3 buildinfo_2.13 buildinfo_3 repodocs_2.13 repodocs_3 + modules-ignore: grackle-demo_3 grackle-demo_3 benchmarks_3 benchmarks_3 rootjs_3 rootjs_3 docs_3 docs_3 buildinfo_native0.5_3 buildinfo_native0.5_3 buildinfo_sjs1_3 buildinfo_sjs1_3 profile_3 profile_3 rootjvm_3 rootjvm_3 rootnative_3 rootnative_3 buildinfo_3 buildinfo_3 repodocs_3 repodocs_3 configs-ignore: test scala-tool scala-doc-tool test-internal coverage: diff --git a/build.sbt b/build.sbt index 6088154c..272115e2 100644 --- a/build.sbt +++ b/build.sbt @@ -33,7 +33,7 @@ val shapeless3Version = "3.6.0" val sourcePosVersion = "1.2.0" val typenameVersion = "1.1.2" -val Scala2 = "2.13.18" +val Scala2 = "3.9.0" val Scala3 = "3.3.8" ThisBuild / scalaVersion := Scala2