From c66d29aaae49ef3c5ca347c7f166437ea3e9c34e Mon Sep 17 00:00:00 2001
From: Alexey Rykhalskiy <alexey.rykhalskiy@gmail.com>
Date: Tue, 12 Sep 2023 12:47:55 +0300
Subject: [PATCH] -- spark cleanup

---
 build.sbt                                        | 12 ++----------
 project/Settings.scala                           |  2 +-
 sparkx/src/main/resources/{intro0 => }/cars.json |  0
 3 files changed, 3 insertions(+), 11 deletions(-)
 rename sparkx/src/main/resources/{intro0 => }/cars.json (100%)

diff --git a/build.sbt b/build.sbt
index 4288c0bd..630f2130 100644
--- a/build.sbt
+++ b/build.sbt
@@ -273,18 +273,10 @@ lazy val plain3 = (project in file("plain3"))
 lazy val sparkx = (project in file("sparkx"))
   .settings(
     Settings.common,
-    scalaVersion := v.vScala213,
-    scalacOptions -= ScalacOpts.macroAnnotations,
     libraryDependencies ++= Seq(
-      "org.apache.spark" %% "spark-core" % "3.3.2",
-      "org.apache.spark" %% "spark-sql"  % "3.3.2"
+      "org.apache.spark" %% "spark-core" % "3.4.1",
+      "org.apache.spark" %% "spark-sql"  % "3.4.1"
     ),
-    // it doesn't really fix the issue, but to avoid any sbt failures
-    // TODO: remove or possibly move to another repo later
-    dependencyOverrides ++= Seq(
-      "io.netty"                % "netty-all" % "4.1.90.Final",
-      "org.scala-lang.modules" %% "scala-xml" % "2.1.0"
-    )
   )
 
 lazy val typesafe = (project in file("typesafe"))
diff --git a/project/Settings.scala b/project/Settings.scala
index 2dee5df4..8eb1b24a 100644
--- a/project/Settings.scala
+++ b/project/Settings.scala
@@ -8,7 +8,7 @@ object Settings {
   val common: Seq[Setting[?]] = Seq(
     scalaVersion := Versions.vScala213,
     organization := "alexr",
-    version := "2023.08.28",
+    version := "2023.09.12",
     javacOptions ++= CompilerOptions.javacOptions,
     scalacOptions ++= CompilerOptions.scalacOptions,
     scalacOptions -= ScalacOpts.warningsAsFatals,
diff --git a/sparkx/src/main/resources/intro0/cars.json b/sparkx/src/main/resources/cars.json
similarity index 100%
rename from sparkx/src/main/resources/intro0/cars.json
rename to sparkx/src/main/resources/cars.json