Delete spark 2.4.x version

.github/actions/build_and_coverage/action.yml

@@ -65,7 +65,7 @@ runs:
  if: contains(env.SCOPE, 'uploadReport')
  uses: codecov/codecov-action@v3
  with:
- files: ./target/scala-2.11/scoverage-report/scoverage.xml,./target/scala-2.12/scoverage-report/scoverage.xml,./target/scala-2.13/scoverage-report/scoverage.xml
+ files: ./target/scala-2.12/scoverage-report/scoverage.xml,./target/scala-2.13/scoverage-report/scoverage.xml
  fail_ci_if_error: true
  verbose: false
  flags: 'spark-${{ env.SPARK_VERSION }}.x'

.github/codecov.yml

@@ -3,7 +3,7 @@ codecov:
  branch: main
  notify:
  wait_for_ci: true
- after_n_builds: 5
+ after_n_builds: 4
 
 coverage:
  precision: 2
@@ -37,4 +37,4 @@ comment:
  layout: "reach,diff,flags,files,footer"
  behavior: once # once: update, if exists. Otherwise, post new. Skip if deleted.
  require_changes: false # if true: only post the comment if coverage changes
- after_n_builds: 5
+ after_n_builds: 4

.github/workflows/matrix_includes.json

@@ -1,44 +1,4 @@
 [
- {
- "spark": "2.4.1",
- "scope": "test",
- "isRelease": "-"
- },
- {
- "spark": "2.4.2",
- "scope": "test",
- "isRelease": "-"
- },
- {
- "spark": "2.4.3",
- "scope": "test",
- "isRelease": "-"
- },
- {
- "spark": "2.4.4",
- "scope": "test",
- "isRelease": "-"
- },
- {
- "spark": "2.4.5",
- "scope": "test",
- "isRelease": "-"
- },
- {
- "spark": "2.4.6",
- "scope": "test",
- "isRelease": "-"
- },
- {
- "spark": "2.4.7",
- "scope": "test",
- "isRelease": "-"
- },
- {
- "spark": "2.4",
- "scope": "test-uploadReport",
- "isRelease": "release"
- },
  {
  "spark": "3.0.0",
  "scope": "test",

.scala-steward.conf

@@ -2,9 +2,6 @@ updates.pin = [
  { groupId = "org.scala-lang", artifactId = "scala-library", version = "2.12." }
 ]
 
-updates.ignore = [
-# Ignored because of spark 2.4 as there is no version for scala 2.11 on further versions
- { groupId = "org.scoverage", artifactId = "sbt-scoverage" }
-]
+updates.ignore = []
 
 commits.message = "ScalaSteward: Update ${artifactName} from ${currentVersion} to ${nextVersion}"

README.md

@@ -11,14 +11,14 @@ Type-safe columns for spark DataFrames!
 [![Scala Steward badge](https://img.shields.io/badge/Scala_Steward-helping-blue.svg?style=flat&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAQCAMAAAARSr4IAAAAVFBMVEUAAACHjojlOy5NWlrKzcYRKjGFjIbp293YycuLa3pYY2LSqql4f3pCUFTgSjNodYRmcXUsPD/NTTbjRS+2jomhgnzNc223cGvZS0HaSD0XLjbaSjElhIr+AAAAAXRSTlMAQObYZgAAAHlJREFUCNdNyosOwyAIhWHAQS1Vt7a77/3fcxxdmv0xwmckutAR1nkm4ggbyEcg/wWmlGLDAA3oL50xi6fk5ffZ3E2E3QfZDCcCN2YtbEWZt+Drc6u6rlqv7Uk0LdKqqr5rk2UCRXOk0vmQKGfc94nOJyQjouF9H/wCc9gECEYfONoAAAAASUVORK5CYII=)](https://scala-steward.org)
 [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/hablapps/doric/main?filepath=notebooks)
 
-| Spark | Maven Central | Codecov |
-|:-----:|:------------------------------------------------------------------------------------------------------------------------------------------------------------:|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| 2.4.x | [![Maven Central](https://img.shields.io/maven-central/v/org.hablapps/doric_2-4_2.11)](https://mvnrepository.com/artifact/org.hablapps/doric_2-4_2.11/0.0.7) | [![Codecov](https://img.shields.io/codecov/c/github/hablapps/doric?flag=spark-2.4.x&label=codecov&logo=codecov&token=N7ZXUXZX1I)](https://codecov.io/gh/hablapps/doric) |
-| 3.0.x | [![Maven Central](https://img.shields.io/maven-central/v/org.hablapps/doric_3-0_2.12)](https://mvnrepository.com/artifact/org.hablapps/doric_3-0_2.12/0.0.7) | [![Codecov](https://img.shields.io/codecov/c/github/hablapps/doric?flag=spark-3.0.x&label=codecov&logo=codecov&token=N7ZXUXZX1I)](https://codecov.io/gh/hablapps/doric) |
-| 3.1.x | [![Maven Central](https://img.shields.io/maven-central/v/org.hablapps/doric_3-1_2.12)](https://mvnrepository.com/artifact/org.hablapps/doric_3-1_2.12/0.0.7) | [![Codecov](https://img.shields.io/codecov/c/github/hablapps/doric?flag=spark-3.1.x&label=codecov&logo=codecov&token=N7ZXUXZX1I)](https://codecov.io/gh/hablapps/doric) |
-| 3.2.x | [![Maven Central](https://img.shields.io/maven-central/v/org.hablapps/doric_3-2_2.12)](https://mvnrepository.com/artifact/org.hablapps/doric_3-2_2.12/0.0.7) | [![Codecov](https://img.shields.io/codecov/c/github/hablapps/doric?flag=spark-3.2.x&label=codecov&logo=codecov&token=N7ZXUXZX1I)](https://codecov.io/gh/hablapps/doric) |
-| 3.3.x | [![Maven Central](https://img.shields.io/maven-central/v/org.hablapps/doric_3-3_2.12)](https://mvnrepository.com/artifact/org.hablapps/doric_3-3_2.12/0.0.7) | [![Codecov](https://img.shields.io/codecov/c/github/hablapps/doric?flag=spark-3.3.x&label=codecov&logo=codecov&token=N7ZXUXZX1I)](https://codecov.io/gh/hablapps/doric) |
-| 3.4.x | [![Maven Central](https://img.shields.io/maven-central/v/org.hablapps/doric_3-4_2.12)](https://mvnrepository.com/artifact/org.hablapps/doric_3-4_2.12/0.0.7) | [![Codecov](https://img.shields.io/codecov/c/github/hablapps/doric?flag=spark-3.4.x&label=codecov&logo=codecov&token=N7ZXUXZX1I)](https://codecov.io/gh/hablapps/doric) |
+| Spark |  Maven Central  | Codecov |
+|:-----:|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 2.4.x |Deprecated [![Maven Central](https://img.shields.io/maven-central/v/org.hablapps/doric_2-4_2.11)](https://mvnrepository.com/artifact/org.hablapps/doric_2-4_2.11/0.0.7)  | [![Codecov](https://img.shields.io/codecov/c/github/hablapps/doric?flag=spark-2.4.x&label=codecov&logo=codecov&token=N7ZXUXZX1I)](https://codecov.io/gh/hablapps/doric) |
+| 3.0.x |  [![Maven Central](https://img.shields.io/maven-central/v/org.hablapps/doric_3-0_2.12)](https://mvnrepository.com/artifact/org.hablapps/doric_3-0_2.12/0.0.7)  | [![Codecov](https://img.shields.io/codecov/c/github/hablapps/doric?flag=spark-3.0.x&label=codecov&logo=codecov&token=N7ZXUXZX1I)](https://codecov.io/gh/hablapps/doric) |
+| 3.1.x |  [![Maven Central](https://img.shields.io/maven-central/v/org.hablapps/doric_3-1_2.12)](https://mvnrepository.com/artifact/org.hablapps/doric_3-1_2.12/0.0.7)  | [![Codecov](https://img.shields.io/codecov/c/github/hablapps/doric?flag=spark-3.1.x&label=codecov&logo=codecov&token=N7ZXUXZX1I)](https://codecov.io/gh/hablapps/doric) |
+| 3.2.x |  [![Maven Central](https://img.shields.io/maven-central/v/org.hablapps/doric_3-2_2.12)](https://mvnrepository.com/artifact/org.hablapps/doric_3-2_2.12/0.0.7)  | [![Codecov](https://img.shields.io/codecov/c/github/hablapps/doric?flag=spark-3.2.x&label=codecov&logo=codecov&token=N7ZXUXZX1I)](https://codecov.io/gh/hablapps/doric) |
+| 3.3.x |  [![Maven Central](https://img.shields.io/maven-central/v/org.hablapps/doric_3-3_2.12)](https://mvnrepository.com/artifact/org.hablapps/doric_3-3_2.12/0.0.7)  | [![Codecov](https://img.shields.io/codecov/c/github/hablapps/doric?flag=spark-3.3.x&label=codecov&logo=codecov&token=N7ZXUXZX1I)](https://codecov.io/gh/hablapps/doric) |
+| 3.4.x |  [![Maven Central](https://img.shields.io/maven-central/v/org.hablapps/doric_3-4_2.12)](https://mvnrepository.com/artifact/org.hablapps/doric_3-4_2.12/0.0.7)  | [![Codecov](https://img.shields.io/codecov/c/github/hablapps/doric?flag=spark-3.4.x&label=codecov&logo=codecov&token=N7ZXUXZX1I)](https://codecov.io/gh/hablapps/doric) |
 ----
 
 Doric offers type-safety in DataFrame column expressions at a minimum
@@ -66,30 +66,23 @@ _Maven_
 `Doric` depends on Spark internals, and it's been tested against the
 following spark versions.
 
-| Spark | Scala | Tested | doric |
-|:-----:|:-----:|:------:|:------------------------------------------------------------------------------------------------------------------------------------------------------------:|
-| 2.4.1 | 2.11 | ✅ | - |
-| 2.4.2 | 2.11 | ✅ | - |
-| 2.4.3 | 2.11 | ✅ | - |
-| 2.4.4 | 2.11 | ✅ | - |
-| 2.4.5 | 2.11 | ✅ | - |
-| 2.4.6 | 2.11 | ✅ | - |
-| 2.4.7 | 2.11 | ✅ | - |
-| 2.4.8 | 2.11 | ✅ | [![Maven Central](https://img.shields.io/maven-central/v/org.hablapps/doric_2-4_2.11)](https://mvnrepository.com/artifact/org.hablapps/doric_2-4_2.11/0.0.7) |
-| 3.0.0 | 2.12 | ✅ | - |
-| 3.0.1 | 2.12 | ✅ | - |
-| 3.0.2 | 2.12 | ✅ | [![Maven Central](https://img.shields.io/maven-central/v/org.hablapps/doric_3-0_2.12)](https://mvnrepository.com/artifact/org.hablapps/doric_3-0_2.12/0.0.7) |
-| 3.1.0 | 2.12 | ✅ | - |
-| 3.1.1 | 2.12 | ✅ | - |
-| 3.1.2 | 2.12 | ✅ | - |
-| 3.1.3 | 2.12 | ✅ | [![Maven Central](https://img.shields.io/maven-central/v/org.hablapps/doric_3-1_2.12)](https://mvnrepository.com/artifact/org.hablapps/doric_3-1_2.12/0.0.7) |
-| 3.2.0 | 2.12 | ✅ | - |
-| 3.2.1 | 2.12 | ✅ | - |
-| 3.2.2 | 2.12 | ✅ | [![Maven Central](https://img.shields.io/maven-central/v/org.hablapps/doric_3-2_2.12)](https://mvnrepository.com/artifact/org.hablapps/doric_3-2_2.12/0.0.7) |
-| 3.3.0 | 2.12 | ✅ | - |
-| 3.3.1 | 2.12 | ✅ | - |
-| 3.3.2 | 2.12 | ✅ | [![Maven Central](https://img.shields.io/maven-central/v/org.hablapps/doric_3-3_2.12)](https://mvnrepository.com/artifact/org.hablapps/doric_3-3_2.12/0.0.7) |
-| 3.4.0 | 2.12 | ✅ | [![Maven Central](https://img.shields.io/maven-central/v/org.hablapps/doric_3-4_2.12)](https://mvnrepository.com/artifact/org.hablapps/doric_3-4_2.12/0.0.7) |
+| Spark | Scala | Tested | doric |
+|:-----:|:-----------:|:------:|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
+| 2.4.x | 2.11 | ✅ | Deprecated [![Maven Central](https://img.shields.io/maven-central/v/org.hablapps/doric_2-4_2.11)](https://mvnrepository.com/artifact/org.hablapps/doric_2-4_2.11/0.0.7) |
+| 3.0.0 | 2.12 | ✅ | - |
+| 3.0.1 | 2.12 | ✅ | - |
+| 3.0.2 | 2.12 | ✅ | [![Maven Central](https://img.shields.io/maven-central/v/org.hablapps/doric_3-0_2.12)](https://mvnrepository.com/artifact/org.hablapps/doric_3-0_2.12/0.0.7) |
+| 3.1.0 | 2.12 | ✅ | - |
+| 3.1.1 | 2.12 | ✅ | - |
+| 3.1.2 | 2.12 | ✅ | - |
+| 3.1.3 | 2.12 | ✅ | [![Maven Central](https://img.shields.io/maven-central/v/org.hablapps/doric_3-1_2.12)](https://mvnrepository.com/artifact/org.hablapps/doric_3-1_2.12/0.0.7) |
+| 3.2.0 | 2.12 | ✅ | - |
+| 3.2.1 | 2.12 | ✅ | - |
+| 3.2.2 | 2.12 / 2.13 | ✅ | [![Maven Central](https://img.shields.io/maven-central/v/org.hablapps/doric_3-2_2.12)](https://mvnrepository.com/artifact/org.hablapps/doric_3-2_2.12/0.0.7) |
+| 3.3.0 | 2.12 / 2.13 | ✅ | - |
+| 3.3.1 | 2.12 / 2.13 | ✅ | - |
+| 3.3.2 | 2.12 / 2.13 | ✅ | [![Maven Central](https://img.shields.io/maven-central/v/org.hablapps/doric_3-3_2.12)](https://mvnrepository.com/artifact/org.hablapps/doric_3-3_2.12/0.0.7) |
+| 3.4.0 | 2.12 / 2.13 | ✅ | [![Maven Central](https://img.shields.io/maven-central/v/org.hablapps/doric_3-4_2.12)](https://mvnrepository.com/artifact/org.hablapps/doric_3-4_2.12/0.0.7) |
 
 
 

build.sbt

@@ -1,11 +1,10 @@
 import scala.language.postfixOps
 
-import sbt.Compile
+//import sbt.Compile
 
 val stableVersion = "0.0.7"
 
 val sparkDefaultShortVersion = "3.4"
-val spark24Version = "2.4.8"
 val spark30Version = "3.0.3"
 val spark31Version = "3.1.3"
 val spark32Version = "3.2.3"
@@ -15,12 +14,10 @@ val spark34Version = "3.4.0"
 val versionRegex = """^(.*)\.(.*)\.(.*)$""".r
 val versionRegexShort = """^(.*)\.(.*)$""".r
 
-val scala211 = "2.11.12"
 val scala212 = "2.12.15"
 val scala213 = "2.13.8"
 
 val parserSparkVersion: String => String = {
- case versionRegexShort("2", "4") => spark24Version
  case versionRegexShort("3", "0") => spark30Version
  case versionRegexShort("3", "1") => spark31Version
  case versionRegexShort("3", "2") => spark32Version
@@ -34,19 +31,13 @@ val long2ShortVersion: String => String = { case versionRegex(a, b, _) =>
 }
 
 val scalaVersionSelect: String => List[String] = {
- case versionRegex("2", _, _) => List(scala211)
  case versionRegex("3", "0", _) => List(scala212)
  case versionRegex("3", "1", _) => List(scala212)
  case versionRegex("3", "2", _) => List(scala212, scala213)
  case versionRegex("3", "3", _) => List(scala212, scala213)
  case versionRegex("3", "4", _) => List(scala212, scala213)
 }
 
-val catsVersion: String => String = {
- case versionRegex("2", _, _) => "2.0.0"
- case _ => "2.7.0"
-}
-
 ThisBuild / organization := "org.hablapps"
 ThisBuild / homepage := Some(url("https://github.com/hablapps/doric"))
 ThisBuild / licenses := List(
@@ -128,7 +119,7 @@ lazy val core = project
  crossScalaVersions := scalaVersionSelect(sparkVersion.value),
  libraryDependencies ++= Seq(
  "org.apache.spark" %% "spark-sql" % sparkVersion.value % "provided", // scala-steward:off
- "org.typelevel" %% "cats-core" % catsVersion(sparkVersion.value),
+ "org.typelevel" %% "cats-core" % "2.7.0",
  "com.lihaoyi" %% "sourcecode" % "0.3.0",
  "com.chuusai" %% "shapeless" % "2.3.10",
  "org.scala-lang.modules" %% "scala-collection-compat" % "2.11.0",