-- spark cleanup

djnzx · Sep 12, 2023 · c66d29a · c66d29a
1 parent 2ab1890
commit c66d29a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git 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
@@ -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 → sparkx/src/main/resources/cars.json b/sparkx/src/main/resources/intro0/cars.json → sparkx/src/main/resources/cars.json