Skip to content

Commit c691b67

Browse files
committed
Update Scala versions to 2.12.21 and 2.13.18 in build configurations and documentation.
1 parent 0ceb148 commit c691b67

5 files changed

Lines changed: 14 additions & 14 deletions

File tree

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
scala: [ 2.11.12, 2.12.20, 2.13.17 ]
22+
scala: [ 2.11.12, 2.12.21, 2.13.18 ]
2323
spark: [ 2.4.8, 3.4.4, 3.5.7 ]
2424
exclude:
2525
- scala: 2.11.12
2626
spark: 3.4.4
2727
- scala: 2.11.12
2828
spark: 3.5.7
29-
- scala: 2.12.20
29+
- scala: 2.12.21
3030
spark: 2.4.8
31-
- scala: 2.13.17
31+
- scala: 2.13.18
3232
spark: 2.4.8
33-
- scala: 2.13.17
33+
- scala: 2.13.18
3434
spark: 3.4.4
3535
name: Spark ${{matrix.spark}} on Scala ${{matrix.scala}}
3636
steps:

.github/workflows/jacoco_check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
# Scala 2.12 is chosen since it is supported by the most wide range of Spark versions and
3838
# vendor distributions.
3939
include:
40-
- scala: 2.12.20
40+
- scala: 2.12.21
4141
scalaShort: "2.12"
4242
spark: 3.3.4
4343
overall: 0.0

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -305,12 +305,12 @@ Creating an uber jar for Cobrix is very easy. Steps to build:
305305
sbt -DSPARK_VERSION="2.4.8" ++2.11.12 assembly
306306

307307
# For Scala 2.12
308-
sbt -DSPARK_VERSION="3.3.4" ++2.12.20 assembly
309-
sbt -DSPARK_VERSION="3.4.4" ++2.12.20 assembly
308+
sbt -DSPARK_VERSION="3.3.4" ++2.12.21 assembly
309+
sbt -DSPARK_VERSION="3.4.4" ++2.12.21 assembly
310310

311311
# For Scala 2.13
312-
sbt -DSPARK_VERSION="3.3.4" ++2.13.17 assembly
313-
sbt -DSPARK_VERSION="3.4.4" ++2.13.17 assembly
312+
sbt -DSPARK_VERSION="3.3.4" ++2.13.19 assembly
313+
sbt -DSPARK_VERSION="3.4.4" ++2.13.19 assembly
314314
```
315315

316316
You can collect the uber jar of `spark-cobol` either at
@@ -330,8 +330,8 @@ $ spark-shell --jars spark-cobol_2.12_3.3-2.10.1-SNAPSHOT-bundle.jar
330330
> You can work around it by using default Spark version for a given Scala version:
331331
> ```sh
332332
> sbt ++2.11.12 assembly
333-
> sbt ++2.12.20 assembly
334-
> sbt ++2.13.17 assembly
333+
> sbt ++2.12.21 assembly
334+
> sbt ++2.13.18 assembly
335335
> ```
336336

337337
## Detailed Overview of Features

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import ScalacOptions._
2020
import com.github.sbt.jacoco.report.JacocoReportSettings
2121

2222
lazy val scala211 = "2.11.12"
23-
lazy val scala212 = "2.12.20"
24-
lazy val scala213 = "2.13.17"
23+
lazy val scala212 = "2.12.21"
24+
lazy val scala213 = "2.13.18"
2525

2626
ThisBuild / organization := "za.co.absa.cobrix"
2727

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
<maven.scoverage.version>1.3.0</maven.scoverage.version>
103103

104104
<!-- Frameworks and libraries -->
105-
<scala.version>2.12.20</scala.version>
105+
<scala.version>2.12.21</scala.version>
106106
<scala.compat.version>2.12</scala.compat.version>
107107
<spark.version>3.5.7</spark.version>
108108
<scalatest.version>3.2.19</scalatest.version>

0 commit comments

Comments
 (0)