Documentation update to show new 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

.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}"

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",

core/src/test/resources/log4j.properties

@@ -0,0 +1,7 @@
+log4j.rootLogger=ERROR, console
+
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+logrj.appender.console.Target=System.out
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
+

core/src/test/resources/log4j2.properties

@@ -0,0 +1,17 @@
+status = warn
+
+# Name of the configuration
+name = ConsoleLogConfigDemo
+
+# Console appender configuration
+appender.console.type = Console
+appender.console.name = consoleLogger
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# Root logger level
+rootLogger.level = error
+
+# Root logger referring to console appender
+rootLogger.appenderRef.stdout.ref = consoleLogger
+

project/plugins.sbt

@@ -3,5 +3,5 @@ logLevel := Level.Warn
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
 addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7")
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.3")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8")
 addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2")