diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e72b79fef2..0791454a7a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04] - scala: [2.13, 2.12] + scala: [3, 2.12] java: [corretto@17, corretto@21, corretto@25] exclude: - scala: 2.12 @@ -189,12 +189,12 @@ jobs: if: matrix.java == 'corretto@25' && steps.setup-java-corretto-25.outputs.cache-hit == 'false' run: sbt +update - - name: Download target directories (2.13) + - name: Download target directories (3) uses: actions/download-artifact@v6 with: - name: target-${{ matrix.os }}-${{ matrix.java }}-2.13 + name: target-${{ matrix.os }}-${{ matrix.java }}-3 - - name: Inflate target directories (2.13) + - name: Inflate target directories (3) run: | tar xf targets.tar rm targets.tar @@ -301,7 +301,7 @@ jobs: - name: Submit Dependencies uses: scalacenter/sbt-dependency-submission@v2 with: - modules-ignore: scio_2.13 scio_2.12 scio-examples_2.13 scio-examples_2.12 integration_2.13 integration_2.12 scio-jmh_2.13 scio-jmh_2.12 socco-plugin_2.13 socco-plugin_2.12 + modules-ignore: scio_3 scio_2.12 scio-examples_3 scio-examples_2.12 integration_3 integration_2.12 scio-jmh_3 scio-jmh_2.12 socco-plugin_3 socco-plugin_2.12 configs-ignore: test scala-tool scala-doc-tool test-internal validate-steward: @@ -334,7 +334,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04] - scala: [2.13] + scala: [3] java: [corretto@17] runs-on: ${{ matrix.os }} steps: @@ -373,7 +373,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04] - scala: [2.13] + scala: [3] java: [corretto@17] runs-on: ${{ matrix.os }} steps: @@ -406,7 +406,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04] - scala: [2.13] + scala: [3] java: [corretto@17] runs-on: ${{ matrix.os }} steps: @@ -456,7 +456,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04] - scala: [2.13] + scala: [3] java: [corretto@17] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index c3f0f96168..73648cde97 100644 --- a/build.sbt +++ b/build.sbt @@ -145,7 +145,7 @@ ThisBuild / startYear := Some(2016) ThisBuild / licenses := Seq(License.Apache2) // scala versions -val scala213 = "2.13.18" +val scala213 = "3.8.3" val scala212 = "2.12.21" val scalaDefault = scala213