Skip to content

Commit 024f101

Browse files
committed
Project cleanup, prepare for a release
1 parent 8f880ee commit 024f101

File tree

4 files changed

+22
-79
lines changed

4 files changed

+22
-79
lines changed

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = 3.7.15
1+
version = 3.7.16
22
runner.dialect = scala213
33

44
newlines.beforeMultilineDef = keep

README.md

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,24 @@ 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.15.0 | 3.4.0 / 3.3.0 / 3.2.2 | 2.x | 3.x | 2.12 / 2.13 |
31-
| 0.14.1 | 3.4.0 / 3.3.0 / 3.2.2 | 2.x | 3.x | 2.12 / 2.13 |
32-
| 0.14.0 | 3.3.0 / 3.2.2 / 3.1.3 | 2.x | 3.x | 2.12 / 2.13 |
33-
| 0.13.0 | 3.3.0 / 3.2.2 / 3.1.3 | 2.x | 3.x | 2.12 / 2.13 |
34-
| 0.12.0 | 3.2.1 / 3.1.3 / 3.0.3 | 2.x | 3.x | 2.12 / 2.13 |
35-
| 0.11.1 | 3.2.0 / 3.1.2 / 3.0.1 | 2.x | 2.x | 2.12 / 2.13 |
36-
| 0.11.0* | 3.2.0 / 3.1.2 / 3.0.1 | 2.x | 2.x | 2.12 / 2.13 |
37-
| 0.10.1 | 3.1.0 | 2.x | 2.x | 2.12 |
38-
| 0.9.0 | 3.0.0 | 1.x | 1.x | 2.12 |
39-
| 0.8.0 | 2.4.0 | 1.x | 1.x | 2.11 / 2.12 |
40-
| 0.7.0 | 2.3.1 | 1.x | 1.x | 2.11 |
41-
| 0.6.1 | 2.3.0 | 1.x | 0.8 | 2.11 |
42-
| 0.5.2 | 2.2.1 | 1.x | 0.8 | 2.11 |
43-
| 0.4.1 | 2.2.0 | 1.x | 0.8 | 2.11 |
44-
| 0.4.0 | 2.2.0 | 1.0.0-IF | 0.4 | 2.11 |
28+
| Frameless | Spark | Cats | Cats-Effect | Scala |
29+
|-----------|-----------------------------|----------|-------------|-------------|
30+
| 0.16.0 | 3.5.0 / 3.4.0 / 3.3.0 | 2.x | 3.x | 2.12 / 2.13 |
31+
| 0.15.0 | 3.4.0 / 3.3.0 / 3.2.2 | 2.x | 3.x | 2.12 / 2.13 |
32+
| 0.14.1 | 3.4.0 / 3.3.0 / 3.2.2 | 2.x | 3.x | 2.12 / 2.13 |
33+
| 0.14.0 | 3.3.0 / 3.2.2 / 3.1.3 | 2.x | 3.x | 2.12 / 2.13 |
34+
| 0.13.0 | 3.3.0 / 3.2.2 / 3.1.3 | 2.x | 3.x | 2.12 / 2.13 |
35+
| 0.12.0 | 3.2.1 / 3.1.3 / 3.0.3 | 2.x | 3.x | 2.12 / 2.13 |
36+
| 0.11.1 | 3.2.0 / 3.1.2 / 3.0.1 | 2.x | 2.x | 2.12 / 2.13 |
37+
| 0.11.0* | 3.2.0 / 3.1.2 / 3.0.1 | 2.x | 2.x | 2.12 / 2.13 |
38+
| 0.10.1 | 3.1.0 | 2.x | 2.x | 2.12 |
39+
| 0.9.0 | 3.0.0 | 1.x | 1.x | 2.12 |
40+
| 0.8.0 | 2.4.0 | 1.x | 1.x | 2.11 / 2.12 |
41+
| 0.7.0 | 2.3.1 | 1.x | 1.x | 2.11 |
42+
| 0.6.1 | 2.3.0 | 1.x | 0.8 | 2.11 |
43+
| 0.5.2 | 2.2.1 | 1.x | 0.8 | 2.11 |
44+
| 0.4.1 | 2.2.0 | 1.x | 0.8 | 2.11 |
45+
| 0.4.0 | 2.2.0 | 1.0.0-IF | 0.4 | 2.11 |
4546

4647
_\* 0.11.0 has broken Spark 3.1.2 and 3.0.1 artifacts published._
4748

build.sbt

Lines changed: 1 addition & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
val sparkVersion = "3.5.0"
22
val spark34Version = "3.4.1"
33
val spark33Version = "3.3.3"
4-
val spark32Version = "3.2.4"
54
val catsCoreVersion = "2.10.0"
65
val catsEffectVersion = "3.5.2"
76
val catsMtlVersion = "1.4.0"
@@ -29,7 +28,6 @@ lazy val root = project
2928
`root-spark35`,
3029
`root-spark34`,
3130
`root-spark33`,
32-
`root-spark32`,
3331
docs
3432
)
3533

@@ -60,17 +58,6 @@ lazy val `root-spark33` = project
6058
`ml-spark33`
6159
)
6260

63-
lazy val `root-spark32` = project
64-
.in(file(".spark32"))
65-
.enablePlugins(NoPublishPlugin)
66-
.aggregate(
67-
core,
68-
`cats-spark32`,
69-
`dataset-spark32`,
70-
`refined-spark32`,
71-
`ml-spark32`
72-
)
73-
7461
lazy val core =
7562
project.settings(name := "frameless-core").settings(framelessSettings)
7663

@@ -97,15 +84,6 @@ lazy val `cats-spark33` = project
9784
`dataset-spark33` % "test->test;compile->compile;provided->provided"
9885
)
9986

100-
lazy val `cats-spark32` = project
101-
.settings(name := "frameless-cats-spark32")
102-
.settings(sourceDirectory := (cats / sourceDirectory).value)
103-
.settings(catsSettings)
104-
.settings(spark32Settings)
105-
.dependsOn(
106-
`dataset-spark32` % "test->test;compile->compile;provided->provided"
107-
)
108-
10987
lazy val dataset = project
11088
.settings(name := "frameless-dataset")
11189
.settings(
@@ -146,20 +124,6 @@ lazy val `dataset-spark33` = project
146124
.settings(spark33Settings)
147125
.dependsOn(core % "test->test;compile->compile")
148126

149-
lazy val `dataset-spark32` = project
150-
.settings(name := "frameless-dataset-spark32")
151-
.settings(sourceDirectory := (dataset / sourceDirectory).value)
152-
.settings(
153-
Compile / unmanagedSourceDirectories += (dataset / baseDirectory).value / "src" / "main" / "spark-3"
154-
)
155-
.settings(
156-
Test / unmanagedSourceDirectories += (dataset / baseDirectory).value / "src" / "test" / "spark-3.2"
157-
)
158-
.settings(datasetSettings)
159-
.settings(sparkDependencies(spark32Version))
160-
.settings(spark32Settings)
161-
.dependsOn(core % "test->test;compile->compile")
162-
163127
lazy val refined = project
164128
.settings(name := "frameless-refined")
165129
.settings(refinedSettings)
@@ -183,15 +147,6 @@ lazy val `refined-spark33` = project
183147
`dataset-spark33` % "test->test;compile->compile;provided->provided"
184148
)
185149

186-
lazy val `refined-spark32` = project
187-
.settings(name := "frameless-refined-spark32")
188-
.settings(sourceDirectory := (refined / sourceDirectory).value)
189-
.settings(refinedSettings)
190-
.settings(spark32Settings)
191-
.dependsOn(
192-
`dataset-spark32` % "test->test;compile->compile;provided->provided"
193-
)
194-
195150
lazy val ml = project
196151
.settings(name := "frameless-ml")
197152
.settings(mlSettings)
@@ -223,17 +178,6 @@ lazy val `ml-spark33` = project
223178
`dataset-spark33` % "test->test;compile->compile;provided->provided"
224179
)
225180

226-
lazy val `ml-spark32` = project
227-
.settings(name := "frameless-ml-spark32")
228-
.settings(sourceDirectory := (ml / sourceDirectory).value)
229-
.settings(mlSettings)
230-
.settings(sparkMlDependencies(spark32Version))
231-
.settings(spark32Settings)
232-
.dependsOn(
233-
core % "test->test;compile->compile",
234-
`dataset-spark32` % "test->test;compile->compile;provided->provided"
235-
)
236-
237181
lazy val docs = project
238182
.in(file("mdocs"))
239183
.settings(framelessSettings)
@@ -383,10 +327,6 @@ lazy val framelessSettings = Seq(
383327
libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
384328
) ++ consoleSettings
385329

386-
lazy val spark32Settings = Seq(
387-
tlVersionIntroduced := Map("2.12" -> "0.13.0", "2.13" -> "0.13.0")
388-
)
389-
390330
lazy val spark34Settings = Seq[Setting[_]](
391331
tlVersionIntroduced := Map("2.12" -> "0.14.1", "2.13" -> "0.14.1"),
392332
mimaPreviousArtifacts := Set(
@@ -462,7 +402,7 @@ ThisBuild / developers := List(
462402
ThisBuild / tlCiReleaseBranches := Seq("master")
463403
ThisBuild / tlSitePublishBranch := Some("master")
464404

465-
val roots = List("root-spark32", "root-spark33", "root-spark34")
405+
val roots = List("root-spark33", "root-spark34", "root-spark35")
466406

467407
ThisBuild / githubWorkflowBuildMatrixAdditions += "project" -> roots
468408

project/plugins.sbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % sbtTypelevelVersion)
77
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9")
88

99
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
10+
11+
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")

0 commit comments

Comments
 (0)