#644 Update to the latest Scala patches, and update Spark in CI.

AbsaOSS · Oct 13, 2023 · 9b2ffa2 · 9b2ffa2
1 parent 6e879c6
commit 9b2ffa2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,12 +18,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        scala: [ 2.11.12, 2.12.17, 2.13.10 ]
-        spark: [ 2.4.8, 3.3.2 ]
+        scala: [ 2.11.12, 2.12.18, 2.13.12 ]
+        spark: [ 2.4.8, 3.4.1, 3.5.0 ]
         exclude:
           - scala: 2.11.12
-            spark: 3.3.2
-          - scala: 2.13.10
+            spark: 3.4.1
+          - scala: 2.11.12
+            spark: 3.5.0
+          - scala: 2.12.18
+            spark: 2.4.8
+          - scala: 2.13.12
             spark: 2.4.8
     name: Spark ${{matrix.spark}} on Scala ${{matrix.scala}}
     steps:

diff --git a/build.sbt b/build.sbt
@@ -20,8 +20,8 @@ import ScalacOptions._
 import com.github.sbt.jacoco.report.JacocoReportSettings
 
 lazy val scala211 = "2.11.12"
-lazy val scala212 = "2.12.17"
-lazy val scala213 = "2.13.10"
+lazy val scala212 = "2.12.18"
+lazy val scala213 = "2.13.12"
 
 ThisBuild / organization := "za.co.absa.cobrix"
 

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -28,8 +28,8 @@ object Dependencies {
   private val mockitoVersion = "4.11.0"
 
   private val defaultSparkVersionForScala211 = "2.4.8"
-  private val defaultSparkVersionForScala212 = "3.2.3"
-  private val defaultSparkVersionForScala213 = "3.3.2"
+  private val defaultSparkVersionForScala212 = "3.4.1"
+  private val defaultSparkVersionForScala213 = "3.5.0"
 
   def sparkFallbackVersion(scalaVersion: String): String = {
     if (scalaVersion.startsWith("2.11.")) {