diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 30fb20ee..a64bc2ac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,17 +19,19 @@ jobs: strategy: fail-fast: false matrix: - scala: [ 2.11.12, 2.12.20, 2.13.15 ] - spark: [ 2.4.8, 3.4.3, 3.5.3 ] + scala: [ 2.11.12, 2.12.20, 2.13.16 ] + spark: [ 2.4.8, 3.4.4, 3.5.5 ] exclude: - scala: 2.11.12 - spark: 3.4.3 + spark: 3.4.4 - scala: 2.11.12 - spark: 3.5.3 + spark: 3.5.5 - scala: 2.12.20 spark: 2.4.8 - - scala: 2.13.15 + - scala: 2.13.16 spark: 2.4.8 + - scala: 2.13.16 + spark: 3.4.4 name: Spark ${{matrix.spark}} on Scala ${{matrix.scala}} steps: - name: Checkout code diff --git a/README.md b/README.md index 16408dd5..310be9d3 100644 --- a/README.md +++ b/README.md @@ -308,8 +308,8 @@ Creating an uber jar for Cobrix is very easy. Steps to build: sbt -DSPARK_VERSION="3.4.4" ++2.12.20 assembly # For Scala 2.13 - sbt -DSPARK_VERSION="3.3.4" ++2.13.15 assembly - sbt -DSPARK_VERSION="3.4.4" ++2.13.15 assembly + sbt -DSPARK_VERSION="3.3.4" ++2.13.16 assembly + sbt -DSPARK_VERSION="3.4.4" ++2.13.16 assembly ``` You can collect the uber jar of `spark-cobol` either at @@ -330,7 +330,7 @@ $ spark-shell --jars spark-cobol_2.12_3.3-2.8.3-SNAPSHOT-bundle.jar > ```sh > sbt ++2.11.12 assembly > sbt ++2.12.20 assembly -> sbt ++2.13.15 assembly +> sbt ++2.13.16 assembly > ``` ## Other Features diff --git a/build.sbt b/build.sbt index 4dd7493c..92cb7aa9 100644 --- a/build.sbt +++ b/build.sbt @@ -21,7 +21,7 @@ import com.github.sbt.jacoco.report.JacocoReportSettings lazy val scala211 = "2.11.12" lazy val scala212 = "2.12.20" -lazy val scala213 = "2.13.15" +lazy val scala213 = "2.13.16" ThisBuild / organization := "za.co.absa.cobrix" diff --git a/examples/spark-cobol-app/build.sbt b/examples/spark-cobol-app/build.sbt index f4d0b7d6..c76529cc 100644 --- a/examples/spark-cobol-app/build.sbt +++ b/examples/spark-cobol-app/build.sbt @@ -17,9 +17,9 @@ ThisBuild / organization := "com.example" ThisBuild / name := "spark-cobol-app" ThisBuild / version := "0.1.0-SNAPSHOT" -ThisBuild / scalaVersion := "2.12.17" +ThisBuild / scalaVersion := "2.12.20" -val sparkVersion = "3.5.3" +val sparkVersion = "3.5.5" val sparkCobolVersion = "2.8.2" val scalatestVersion = "3.2.14" diff --git a/examples/spark-cobol-app/pom.xml b/examples/spark-cobol-app/pom.xml index e439de22..6307fdf6 100755 --- a/examples/spark-cobol-app/pom.xml +++ b/examples/spark-cobol-app/pom.xml @@ -27,10 +27,10 @@ UTF-8 - 2.12.17 + 2.12.20 2.12 3.2.14 - 3.5.3 + 3.5.5 2.8.2 diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 85c18ffa..a8697936 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -27,8 +27,8 @@ object Dependencies { private val mockitoVersion = "4.11.0" private val defaultSparkVersionForScala211 = "2.4.8" - private val defaultSparkVersionForScala212 = "3.4.3" - private val defaultSparkVersionForScala213 = "3.5.3" + private val defaultSparkVersionForScala212 = "3.4.4" + private val defaultSparkVersionForScala213 = "3.5.5" def sparkFallbackVersion(scalaVersion: String): String = { if (scalaVersion.startsWith("2.11.")) {