From 2f96150ea8c778c55eb00c621a1006b2f8aa8ad7 Mon Sep 17 00:00:00 2001 From: Felipe Fujiy Pessoto Date: Sat, 25 Oct 2025 11:27:35 -0700 Subject: [PATCH] Change Scala version to match Spark 4.0 Signed-off-by: Felipe Fujiy Pessoto --- .github/workflows/connectors_test.yaml | 2 +- .github/workflows/iceberg_test.yaml | 2 +- .github/workflows/kernel_test.yaml | 2 +- .github/workflows/spark_examples_test.yaml | 2 +- .github/workflows/spark_master_test.yaml | 2 +- .github/workflows/spark_python_test.yaml | 2 +- .github/workflows/spark_test.yaml | 2 +- .github/workflows/unidoc.yaml | 2 +- .github/workflows/unity_test.yaml | 2 +- build.sbt | 4 ++-- connectors/examples/build.sbt | 2 +- connectors/examples/run_examples.py | 4 ++-- examples/scala/build.sbt | 2 +- run-tests.py | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/connectors_test.yaml b/.github/workflows/connectors_test.yaml index 1087d2e5806..4f8a0568a5e 100644 --- a/.github/workflows/connectors_test.yaml +++ b/.github/workflows/connectors_test.yaml @@ -7,7 +7,7 @@ jobs: strategy: matrix: # These Scala versions must match those in the build.sbt - scala: [2.13.13] + scala: [2.13.16] steps: - uses: actions/checkout@v2 - name: install java diff --git a/.github/workflows/iceberg_test.yaml b/.github/workflows/iceberg_test.yaml index 849b09dfc28..001e9a97ede 100644 --- a/.github/workflows/iceberg_test.yaml +++ b/.github/workflows/iceberg_test.yaml @@ -7,7 +7,7 @@ jobs: strategy: matrix: # These Scala versions must match those in the build.sbt - scala: [2.13.13] + scala: [2.13.16] env: SCALA_VERSION: ${{ matrix.scala }} steps: diff --git a/.github/workflows/kernel_test.yaml b/.github/workflows/kernel_test.yaml index fabbecaf174..b43fdaca81b 100644 --- a/.github/workflows/kernel_test.yaml +++ b/.github/workflows/kernel_test.yaml @@ -20,7 +20,7 @@ jobs: matrix: shard: [0, 1, 2, 3] env: - SCALA_VERSION: 2.13.13 + SCALA_VERSION: 2.13.16 NUM_SHARDS: 4 DISABLE_UNIDOC: true # Another unidoc workflow will test unidoc. TEST_PARALLELISM_COUNT: 4 diff --git a/.github/workflows/spark_examples_test.yaml b/.github/workflows/spark_examples_test.yaml index 4524f015073..302cc150f3d 100644 --- a/.github/workflows/spark_examples_test.yaml +++ b/.github/workflows/spark_examples_test.yaml @@ -7,7 +7,7 @@ jobs: strategy: matrix: # These Scala versions must match those in the build.sbt - scala: [2.13.13] + scala: [2.13.16] env: SCALA_VERSION: ${{ matrix.scala }} steps: diff --git a/.github/workflows/spark_master_test.yaml b/.github/workflows/spark_master_test.yaml index c3b42453f22..afb3f4c0dac 100644 --- a/.github/workflows/spark_master_test.yaml +++ b/.github/workflows/spark_master_test.yaml @@ -7,7 +7,7 @@ jobs: strategy: matrix: # These Scala versions must match those in the build.sbt - scala: [2.13.13] + scala: [2.13.16] # Important: This list of shards must be [0..NUM_SHARDS - 1] shard: [0, 1, 2, 3] env: diff --git a/.github/workflows/spark_python_test.yaml b/.github/workflows/spark_python_test.yaml index 17f9214c426..1f471fe8046 100644 --- a/.github/workflows/spark_python_test.yaml +++ b/.github/workflows/spark_python_test.yaml @@ -7,7 +7,7 @@ jobs: strategy: matrix: # These Scala versions must match those in the build.sbt - scala: [2.13.13] + scala: [2.13.16] env: SCALA_VERSION: ${{ matrix.scala }} steps: diff --git a/.github/workflows/spark_test.yaml b/.github/workflows/spark_test.yaml index c469b2998db..d0001bdd10e 100644 --- a/.github/workflows/spark_test.yaml +++ b/.github/workflows/spark_test.yaml @@ -7,7 +7,7 @@ jobs: strategy: matrix: # These Scala versions must match those in the build.sbt - scala: [2.13.13] + scala: [2.13.16] # Important: This list of shards must be [0..NUM_SHARDS - 1] shard: [0, 1, 2, 3] env: diff --git a/.github/workflows/unidoc.yaml b/.github/workflows/unidoc.yaml index 54936d5a4d5..979c1cfa962 100644 --- a/.github/workflows/unidoc.yaml +++ b/.github/workflows/unidoc.yaml @@ -7,7 +7,7 @@ strategy: matrix: # These Scala versions must match those in the build.sbt - scala: [2.13.13] + scala: [2.13.16] steps: - name: install java uses: actions/setup-java@v3 diff --git a/.github/workflows/unity_test.yaml b/.github/workflows/unity_test.yaml index 1347ff323e0..0299eed61b6 100644 --- a/.github/workflows/unity_test.yaml +++ b/.github/workflows/unity_test.yaml @@ -5,7 +5,7 @@ jobs: name: "Delta Unity Tests" runs-on: ubuntu-24.04 env: - SCALA_VERSION: 2.13.13 + SCALA_VERSION: 2.13.16 steps: - uses: actions/checkout@v3 - uses: technote-space/get-diff-action@v4 diff --git a/build.sbt b/build.sbt index 90bd9b9c189..e83160c3d5c 100644 --- a/build.sbt +++ b/build.sbt @@ -40,14 +40,14 @@ import Mima._ import Unidoc._ // Scala versions -val scala213 = "2.13.13" +val scala213 = "2.13.16" val all_scala_versions = Seq(scala213) // Due to how publishArtifact is determined for javaOnlyReleaseSettings, incl. storage // It was necessary to change default_scala_version to scala213 in build.sbt // to build the project with Scala 2.13 only // As a setting, it's possible to set it on command line easily -// sbt 'set default_scala_version := 2.13.13' [commands] +// sbt 'set default_scala_version := 2.13.16' [commands] // FIXME Why not use scalaVersion? val default_scala_version = settingKey[String]("Default Scala version") Global / default_scala_version := scala213 diff --git a/connectors/examples/build.sbt b/connectors/examples/build.sbt index 0820ae27329..da1d7d075e2 100644 --- a/connectors/examples/build.sbt +++ b/connectors/examples/build.sbt @@ -22,7 +22,7 @@ scalaVersion := "2.12.18" version := "0.1.0" lazy val commonSettings = Seq( - crossScalaVersions := Seq("2.13.13", "2.12.18", "2.11.12"), + crossScalaVersions := Seq("2.13.16", "2.12.18", "2.11.12"), resolvers += Resolver.mavenLocal, libraryDependencies ++= Seq( "io.delta" %% "delta-standalone" % getStandaloneVersion(), diff --git a/connectors/examples/run_examples.py b/connectors/examples/run_examples.py index 630233073e0..de65394dcad 100644 --- a/connectors/examples/run_examples.py +++ b/connectors/examples/run_examples.py @@ -112,7 +112,7 @@ def __exit__(self, tpe, value, traceback): build/sbt '++2.11.12 publishM2' build/sbt '++2.12.18 publishM2' - build/sbt '++2.13.13 publishM2' + build/sbt '++2.13.16 publishM2' """ # get the version of the package @@ -150,4 +150,4 @@ def __exit__(self, tpe, value, traceback): run_sbt_proj(root_dir, proj, className, args.version, args.maven_repo, "2.11.12") run_sbt_proj(root_dir, proj, className, args.version, args.maven_repo, "2.12.18") - run_sbt_proj(root_dir, proj, className, args.version, args.maven_repo, "2.13.13") + run_sbt_proj(root_dir, proj, className, args.version, args.maven_repo, "2.13.16") diff --git a/examples/scala/build.sbt b/examples/scala/build.sbt index f94028cc4c4..0f07d46a159 100644 --- a/examples/scala/build.sbt +++ b/examples/scala/build.sbt @@ -18,7 +18,7 @@ name := "example" organization := "com.example" organizationName := "example" -val scala213 = "2.13.13" +val scala213 = "2.13.16" val icebergVersion = "1.4.1" val defaultDeltaVersion = { val versionFileContent = IO.read(file("../../version.sbt")) diff --git a/run-tests.py b/run-tests.py index 28f7760f289..39869e030bd 100755 --- a/run-tests.py +++ b/run-tests.py @@ -73,7 +73,7 @@ def run_sbt_tests(root_dir, test_group, coverage, scala_version=None, shard=None cmd += ["+ %s" % test_cmd] # build/sbt ... "+ project/test" ... else: # when no scala version is specified, run test with only the specified scala version - cmd += ["++ %s" % scala_version, test_cmd] # build/sbt ... "++ 2.13.13" "project/test" ... + cmd += ["++ %s" % scala_version, test_cmd] # build/sbt ... "++ 2.13.16" "project/test" ... if coverage: cmd += ["coverageAggregate", "coverageOff"]