Skip to content

Commit 2e25079

Browse files
committed
Make Spark 4 the default version, add Spark 3.5 artifacts
1 parent ce67c08 commit 2e25079

3 files changed

Lines changed: 84 additions & 147 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,12 @@ jobs:
3232
os: [ubuntu-22.04]
3333
scala: [2.13, 2.12]
3434
java: [temurin@8, temurin@17]
35-
project: [root-spark33, root-spark34, root-spark35, root-spark40]
35+
project: [root-spark34, root-spark35, root-spark40]
3636
exclude:
37-
- scala: 2.13
38-
project: root-spark33
3937
- scala: 2.13
4038
project: root-spark34
4139
- scala: 2.12
4240
project: root-spark40
43-
- java: temurin@17
44-
project: root-spark33
4541
- java: temurin@17
4642
project: root-spark34
4743
- java: temurin@17
@@ -221,7 +217,7 @@ jobs:
221217
- name: Submit Dependencies
222218
uses: scalacenter/sbt-dependency-submission@v2
223219
with:
224-
modules-ignore: root-spark33_2.13 root-spark33_2.12 docs_2.13 docs_2.12 root-spark34_2.13 root-spark34_2.12 root-spark35_2.13 root-spark35_2.12 root-spark40_2.13
220+
modules-ignore: docs_2.13 docs_2.12 root-spark34_2.13 root-spark34_2.12 root-spark35_2.13 root-spark35_2.12 root-spark40_2.13
225221
configs-ignore: test scala-tool scala-doc-tool test-internal
226222

227223
site:

README.md

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,25 @@ associated channels (e.g. GitHub, Discord) to be a safe and friendly environment
2525
The compatible versions of [Spark](http://spark.apache.org/) and
2626
[cats](https://github.com/typelevel/cats) are as follows:
2727

28-
| Frameless | Spark | Cats | Cats-Effect | Scala |
29-
|-----------|-----------------------------|----------|-------------|-------------|
30-
| 0.17.0 | 4.0.2† / 3.5.8 / 3.4.4 / 3.3.4 | 2.x | 3.x | 2.12 / 2.13 |
31-
| 0.16.0 | 3.5.0 / 3.4.0 / 3.3.0 | 2.x | 3.x | 2.12 / 2.13 |
32-
| 0.15.0 | 3.4.0 / 3.3.0 / 3.2.2 | 2.x | 3.x | 2.12 / 2.13 |
33-
| 0.14.1 | 3.4.0 / 3.3.0 / 3.2.2 | 2.x | 3.x | 2.12 / 2.13 |
34-
| 0.14.0 | 3.3.0 / 3.2.2 / 3.1.3 | 2.x | 3.x | 2.12 / 2.13 |
35-
| 0.13.0 | 3.3.0 / 3.2.2 / 3.1.3 | 2.x | 3.x | 2.12 / 2.13 |
36-
| 0.12.0 | 3.2.1 / 3.1.3 / 3.0.3 | 2.x | 3.x | 2.12 / 2.13 |
37-
| 0.11.1 | 3.2.0 / 3.1.2 / 3.0.1 | 2.x | 2.x | 2.12 / 2.13 |
38-
| 0.11.0* | 3.2.0 / 3.1.2 / 3.0.1 | 2.x | 2.x | 2.12 / 2.13 |
39-
| 0.10.1 | 3.1.0 | 2.x | 2.x | 2.12 |
40-
| 0.9.0 | 3.0.0 | 1.x | 1.x | 2.12 |
41-
| 0.8.0 | 2.4.0 | 1.x | 1.x | 2.11 / 2.12 |
42-
| 0.7.0 | 2.3.1 | 1.x | 1.x | 2.11 |
43-
| 0.6.1 | 2.3.0 | 1.x | 0.8 | 2.11 |
44-
| 0.5.2 | 2.2.1 | 1.x | 0.8 | 2.11 |
45-
| 0.4.1 | 2.2.0 | 1.x | 0.8 | 2.11 |
46-
| 0.4.0 | 2.2.0 | 1.0.0-IF | 0.4 | 2.11 |
28+
| Frameless | Spark | Cats | Cats-Effect | Scala |
29+
|-----------|-------------------------|----------|-------------|-------------|
30+
| 0.17.0 | 4.0.2† / 3.5.8 / 3.4.4 | 2.x | 3.x | 2.12 / 2.13 |
31+
| 0.16.0 | 3.5.0 / 3.4.0 / 3.3.0 | 2.x | 3.x | 2.12 / 2.13 |
32+
| 0.15.0 | 3.4.0 / 3.3.0 / 3.2.2 | 2.x | 3.x | 2.12 / 2.13 |
33+
| 0.14.1 | 3.4.0 / 3.3.0 / 3.2.2 | 2.x | 3.x | 2.12 / 2.13 |
34+
| 0.14.0 | 3.3.0 / 3.2.2 / 3.1.3 | 2.x | 3.x | 2.12 / 2.13 |
35+
| 0.13.0 | 3.3.0 / 3.2.2 / 3.1.3 | 2.x | 3.x | 2.12 / 2.13 |
36+
| 0.12.0 | 3.2.1 / 3.1.3 / 3.0.3 | 2.x | 3.x | 2.12 / 2.13 |
37+
| 0.11.1 | 3.2.0 / 3.1.2 / 3.0.1 | 2.x | 2.x | 2.12 / 2.13 |
38+
| 0.11.0* | 3.2.0 / 3.1.2 / 3.0.1 | 2.x | 2.x | 2.12 / 2.13 |
39+
| 0.10.1 | 3.1.0 | 2.x | 2.x | 2.12 |
40+
| 0.9.0 | 3.0.0 | 1.x | 1.x | 2.12 |
41+
| 0.8.0 | 2.4.0 | 1.x | 1.x | 2.11 / 2.12 |
42+
| 0.7.0 | 2.3.1 | 1.x | 1.x | 2.11 |
43+
| 0.6.1 | 2.3.0 | 1.x | 0.8 | 2.11 |
44+
| 0.5.2 | 2.2.1 | 1.x | 0.8 | 2.11 |
45+
| 0.4.1 | 2.2.0 | 1.x | 0.8 | 2.11 |
46+
| 0.4.0 | 2.2.0 | 1.0.0-IF | 0.4 | 2.11 |
4747

4848
_\* 0.11.0 has broken Spark 3.1.2 and 3.0.1 artifacts published._
4949

@@ -56,10 +56,9 @@ Starting 0.11 we introduced Spark cross published artifacts:
5656

5757
Artifact names examples:
5858

59-
* `frameless-dataset` (the default Spark 3.5.x dependency)
60-
* `frameless-dataset-spark40` (Spark 4.0.x dependency; Scala 2.13 + JDK 17 only)
59+
* `frameless-dataset` (the default Spark 4.0.x dependency; Scala 2.13 + JDK 17 only)
60+
* `frameless-dataset-spark45` (Spark 3.5.x dependency)
6161
* `frameless-dataset-spark34` (Spark 3.4.x dependency)
62-
* `frameless-dataset-spark33` (Spark 3.3.x dependency)
6362

6463
Versions 0.5.x and 0.6.x have identical features. The first is compatible with Spark 2.2.1 and the second with 2.3.0.
6564

0 commit comments

Comments
 (0)