Project cleanup, prepare for a release

typelevel · Nov 12, 2023 · dbe25a0 · dbe25a0
1 parent 8f880ee
commit dbe25a0
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 82 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,12 +32,12 @@ jobs:
         os: [ubuntu-latest]
         scala: [2.13, 2.12]
         java: [temurin@8]
-        project: [root-spark32, root-spark33, root-spark34]
+        project: [root-spark33, root-spark34, root-spark35]
         exclude:
-          - scala: 2.13
-            project: root-spark32
           - scala: 2.13
             project: root-spark33
+          - scala: 2.13
+            project: root-spark34
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
     steps:
@@ -163,7 +163,7 @@ jobs:
       - name: Submit Dependencies
         uses: scalacenter/sbt-dependency-submission@v2
         with:
-          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-spark32_2.13 root-spark32_2.12
+          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
           configs-ignore: test scala-tool scala-doc-tool test-internal
 
   site:

diff --git a/README.md b/README.md
@@ -25,23 +25,24 @@ associated channels (e.g. GitHub, Discord) to be a safe and friendly environment
 The compatible versions of [Spark](http://spark.apache.org/) and
 [cats](https://github.com/typelevel/cats) are as follows:
 
-| Frameless | Spark                         | Cats     | Cats-Effect | Scala       |
-|-----------|-------------------------------|----------|-------------|-------------|
-| 0.15.0    | 3.4.0 / 3.3.0 / 3.2.2         | 2.x      | 3.x         | 2.12 / 2.13 |
-| 0.14.1    | 3.4.0 / 3.3.0 / 3.2.2         | 2.x      | 3.x         | 2.12 / 2.13 |
-| 0.14.0    | 3.3.0 / 3.2.2 / 3.1.3         | 2.x      | 3.x         | 2.12 / 2.13 |
-| 0.13.0    | 3.3.0 / 3.2.2 / 3.1.3         | 2.x      | 3.x         | 2.12 / 2.13 |
-| 0.12.0    | 3.2.1 / 3.1.3 / 3.0.3         | 2.x      | 3.x         | 2.12 / 2.13 |
-| 0.11.1    | 3.2.0 / 3.1.2 / 3.0.1         | 2.x      | 2.x         | 2.12 / 2.13 |
-| 0.11.0*   | 3.2.0 / 3.1.2 / 3.0.1         | 2.x      | 2.x         | 2.12 / 2.13 |
-| 0.10.1    | 3.1.0                         | 2.x      | 2.x         | 2.12        |
-| 0.9.0     | 3.0.0                         | 1.x      | 1.x         | 2.12        |
-| 0.8.0     | 2.4.0                         | 1.x      | 1.x         | 2.11 / 2.12 |
-| 0.7.0     | 2.3.1                         | 1.x      | 1.x         | 2.11        |
-| 0.6.1     | 2.3.0                         | 1.x      | 0.8         | 2.11        |
-| 0.5.2     | 2.2.1                         | 1.x      | 0.8         | 2.11        |
-| 0.4.1     | 2.2.0                         | 1.x      | 0.8         | 2.11        |
-| 0.4.0     | 2.2.0                         | 1.0.0-IF | 0.4         | 2.11        |
+| Frameless | Spark                       | Cats     | Cats-Effect | Scala       |
+|-----------|-----------------------------|----------|-------------|-------------|
+| 0.16.0    | 3.5.0 / 3.4.0 / 3.3.0       | 2.x      | 3.x         | 2.12 / 2.13 |
+| 0.15.0    | 3.4.0 / 3.3.0 / 3.2.2       | 2.x      | 3.x         | 2.12 / 2.13 |
+| 0.14.1    | 3.4.0 / 3.3.0 / 3.2.2       | 2.x      | 3.x         | 2.12 / 2.13 |
+| 0.14.0    | 3.3.0 / 3.2.2 / 3.1.3       | 2.x      | 3.x         | 2.12 / 2.13 |
+| 0.13.0    | 3.3.0 / 3.2.2 / 3.1.3       | 2.x      | 3.x         | 2.12 / 2.13 |
+| 0.12.0    | 3.2.1 / 3.1.3 / 3.0.3       | 2.x      | 3.x         | 2.12 / 2.13 |
+| 0.11.1    | 3.2.0 / 3.1.2 / 3.0.1       | 2.x      | 2.x         | 2.12 / 2.13 |
+| 0.11.0*   | 3.2.0 / 3.1.2 / 3.0.1       | 2.x      | 2.x         | 2.12 / 2.13 |
+| 0.10.1    | 3.1.0                       | 2.x      | 2.x         | 2.12        |
+| 0.9.0     | 3.0.0                       | 1.x      | 1.x         | 2.12        |
+| 0.8.0     | 2.4.0                       | 1.x      | 1.x         | 2.11 / 2.12 |
+| 0.7.0     | 2.3.1                       | 1.x      | 1.x         | 2.11        |
+| 0.6.1     | 2.3.0                       | 1.x      | 0.8         | 2.11        |
+| 0.5.2     | 2.2.1                       | 1.x      | 0.8         | 2.11        |
+| 0.4.1     | 2.2.0                       | 1.x      | 0.8         | 2.11        |
+| 0.4.0     | 2.2.0                       | 1.0.0-IF | 0.4         | 2.11        |
 
 _\* 0.11.0 has broken Spark 3.1.2 and 3.0.1 artifacts published._
 

diff --git a/build.sbt b/build.sbt
@@ -1,7 +1,6 @@
 val sparkVersion = "3.5.0"
 val spark34Version = "3.4.1"
 val spark33Version = "3.3.3"
-val spark32Version = "3.2.4"
 val catsCoreVersion = "2.10.0"
 val catsEffectVersion = "3.5.2"
 val catsMtlVersion = "1.4.0"
@@ -29,7 +28,6 @@ lazy val root = project
     `root-spark35`,
     `root-spark34`,
     `root-spark33`,
-    `root-spark32`,
     docs
   )
 
@@ -60,17 +58,6 @@ lazy val `root-spark33` = project
     `ml-spark33`
   )
 
-lazy val `root-spark32` = project
-  .in(file(".spark32"))
-  .enablePlugins(NoPublishPlugin)
-  .aggregate(
-    core,
-    `cats-spark32`,
-    `dataset-spark32`,
-    `refined-spark32`,
-    `ml-spark32`
-  )
-
 lazy val core =
   project.settings(name := "frameless-core").settings(framelessSettings)
 
@@ -97,15 +84,6 @@ lazy val `cats-spark33` = project
     `dataset-spark33` % "test->test;compile->compile;provided->provided"
   )
 
-lazy val `cats-spark32` = project
-  .settings(name := "frameless-cats-spark32")
-  .settings(sourceDirectory := (cats / sourceDirectory).value)
-  .settings(catsSettings)
-  .settings(spark32Settings)
-  .dependsOn(
-    `dataset-spark32` % "test->test;compile->compile;provided->provided"
-  )
-
 lazy val dataset = project
   .settings(name := "frameless-dataset")
   .settings(
@@ -146,20 +124,6 @@ lazy val `dataset-spark33` = project
   .settings(spark33Settings)
   .dependsOn(core % "test->test;compile->compile")
 
-lazy val `dataset-spark32` = project
-  .settings(name := "frameless-dataset-spark32")
-  .settings(sourceDirectory := (dataset / sourceDirectory).value)
-  .settings(
-    Compile / unmanagedSourceDirectories += (dataset / baseDirectory).value / "src" / "main" / "spark-3"
-  )
-  .settings(
-    Test / unmanagedSourceDirectories += (dataset / baseDirectory).value / "src" / "test" / "spark-3.2"
-  )
-  .settings(datasetSettings)
-  .settings(sparkDependencies(spark32Version))
-  .settings(spark32Settings)
-  .dependsOn(core % "test->test;compile->compile")
-
 lazy val refined = project
   .settings(name := "frameless-refined")
   .settings(refinedSettings)
@@ -183,15 +147,6 @@ lazy val `refined-spark33` = project
     `dataset-spark33` % "test->test;compile->compile;provided->provided"
   )
 
-lazy val `refined-spark32` = project
-  .settings(name := "frameless-refined-spark32")
-  .settings(sourceDirectory := (refined / sourceDirectory).value)
-  .settings(refinedSettings)
-  .settings(spark32Settings)
-  .dependsOn(
-    `dataset-spark32` % "test->test;compile->compile;provided->provided"
-  )
-
 lazy val ml = project
   .settings(name := "frameless-ml")
   .settings(mlSettings)
@@ -223,17 +178,6 @@ lazy val `ml-spark33` = project
     `dataset-spark33` % "test->test;compile->compile;provided->provided"
   )
 
-lazy val `ml-spark32` = project
-  .settings(name := "frameless-ml-spark32")
-  .settings(sourceDirectory := (ml / sourceDirectory).value)
-  .settings(mlSettings)
-  .settings(sparkMlDependencies(spark32Version))
-  .settings(spark32Settings)
-  .dependsOn(
-    core % "test->test;compile->compile",
-    `dataset-spark32` % "test->test;compile->compile;provided->provided"
-  )
-
 lazy val docs = project
   .in(file("mdocs"))
   .settings(framelessSettings)
@@ -383,10 +327,6 @@ lazy val framelessSettings = Seq(
   libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
 ) ++ consoleSettings
 
-lazy val spark32Settings = Seq(
-  tlVersionIntroduced := Map("2.12" -> "0.13.0", "2.13" -> "0.13.0")
-)
-
 lazy val spark34Settings = Seq[Setting[_]](
   tlVersionIntroduced := Map("2.12" -> "0.14.1", "2.13" -> "0.14.1"),
   mimaPreviousArtifacts := Set(
@@ -462,7 +402,7 @@ ThisBuild / developers := List(
 ThisBuild / tlCiReleaseBranches := Seq("master")
 ThisBuild / tlSitePublishBranch := Some("master")
 
-val roots = List("root-spark32", "root-spark33", "root-spark34")
+val roots = List("root-spark33", "root-spark34", "root-spark35")
 
 ThisBuild / githubWorkflowBuildMatrixAdditions += "project" -> roots
 

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -7,3 +7,5 @@ addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % sbtTypelevelVersion)
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9")
 
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
+
+addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,5 @@ addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % sbtTypelevelVersion)
		addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9")

		addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")

		addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")