Corrected spark dependencies

yadavan88 · yadavan88 · commit 99dcc4e45747 · 2023-01-19T21:22:13.000+01:00
diff --git a/build.sbt b/build.sbt
@@ -187,7 +187,6 @@ lazy val scala_akka_2 = (project in file("scala-akka-2"))
   .enablePlugins(AkkaGrpcPlugin)
   .settings(
     name := "scala-akka-2",
-    scalaVersion := "2.13.10",
     libraryDependencies ++= Seq(
       "com.typesafe.akka" %% "akka-actor-typed" % "2.6.19",
       "com.typesafe.akka" %% "akka-http" % "10.2.10",
@@ -236,6 +235,9 @@ val monixVersion = "3.4.0"
 val elastic4sVersion = "7.16.0"
 val sparkVersion = "3.2.1"
 
+val sparkCoreDep = "org.apache.spark" %% "spark-core" % sparkVersion
+val sparkSqlDep = "org.apache.spark" %% "spark-sql" % sparkVersion
+
 lazy val scala_libraries_2 = (project in file("scala-libraries-2"))
   .settings(
     name := "scala-libraries",
@@ -282,8 +284,8 @@ lazy val scala_libraries_3 = (project in file("scala-libraries-3"))
     name := "scala-libraries",
     libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.2" % Test,
     libraryDependencies ++= Seq(
-      "org.apache.spark" %% "spark-core" % sparkVersion,
-      "org.apache.spark" %% "spark-sql" % sparkVersion
+      sparkSqlDep,
+      sparkCoreDep
     ),
     libraryDependencies ++= Seq(
       "org.http4s" %% "http4s-dsl" % http4sVersion,
@@ -324,7 +326,9 @@ lazy val scala_libraries_4 = (project in file("scala-libraries-4"))
     libraryDependencies ++= Seq(
       "org.scala-lang.modules" %% "scala-async" % "1.0.1",
       "org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided,
-      "org.tpolecat" %% "skunk-core" % "0.3.2"
+      "org.tpolecat" %% "skunk-core" % "0.3.2",
+      sparkSqlDep,
+      sparkCoreDep
     ),
     scalacOptions += "-Xasync"
   )
@@ -404,8 +408,6 @@ lazy val scala212 = (project in file("scala212"))
     scalaVersion := "2.12.17",
     name := "scala212",
     libraryDependencies ++= Seq(
-      scalaTest,
-      "org.apache.spark" %% "spark-core" % sparkVersion,
-      "org.apache.spark" %% "spark-sql" % sparkVersion
+      scalaTest
     )
   )
diff --git a/play-scala/async-tasks/build.sbt b/play-scala/async-tasks/build.sbt
@@ -5,6 +5,6 @@ version := "1.0-SNAPSHOT"
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala)
 
-scalaVersion := "2.13.2"
+scalaVersion := "2.13.10"
 
 libraryDependencies += guice
diff --git a/play-scala/caching-in-play/build.sbt b/play-scala/caching-in-play/build.sbt
@@ -5,7 +5,7 @@ version := "1.0-SNAPSHOT"
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala)
 
-scalaVersion := "2.13.3"
+scalaVersion := "2.13.10"
 
 libraryDependencies += guice
 libraryDependencies += caffeine
diff --git a/play-scala/configuration-access/build.sbt b/play-scala/configuration-access/build.sbt
@@ -5,7 +5,7 @@ version := "1.0-SNAPSHOT"
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala)
 
-scalaVersion := "2.13.3"
+scalaVersion := "2.13.10"
 
 libraryDependencies += guice
 libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test
diff --git a/play-scala/custom-error-handling/build.sbt b/play-scala/custom-error-handling/build.sbt
@@ -5,7 +5,7 @@ version := "1.0-SNAPSHOT"
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala)
 
-scalaVersion := "2.13.2"
+scalaVersion := "2.13.10"
 
 libraryDependencies += guice
 libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test
diff --git a/play-scala/dependency-injection/build.sbt b/play-scala/dependency-injection/build.sbt
@@ -4,7 +4,7 @@ version := "1.0-SNAPSHOT"
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala)
 
-scalaVersion := "2.13.6"
+scalaVersion := "2.13.10"
 
 libraryDependencies += guice
 libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test
diff --git a/play-scala/introduction-to-play/build.sbt b/play-scala/introduction-to-play/build.sbt
@@ -4,6 +4,6 @@ version := "1.0-SNAPSHOT"
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala)
 
-scalaVersion := "2.13.2"
+scalaVersion := "2.13.10"
 
 libraryDependencies += guice libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test
diff --git a/play-scala/play-templates/build.sbt b/play-scala/play-templates/build.sbt
@@ -5,7 +5,7 @@ version := "1.0-SNAPSHOT"
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala)
 
-scalaVersion := "2.13.2"
+scalaVersion := "2.13.10"
 
 libraryDependencies += guice
 libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test
diff --git a/play-scala/rest-api/build.sbt b/play-scala/rest-api/build.sbt
@@ -5,7 +5,7 @@ version := "1.0-SNAPSHOT"
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala)
 
-scalaVersion := "2.13.2"
+scalaVersion := "2.13.10"
 
 libraryDependencies += guice
 libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test
diff --git a/scala-js/build.sbt b/scala-js/build.sbt
@@ -9,7 +9,7 @@ lazy val root = (project in file("."))
     jsEnv := new org.scalajs.jsenv.jsdomnodejs.JSDOMNodeJSEnv()
   )
 
-scalaVersion := "2.13.1"
+scalaVersion := "2.13.10"
 
 scalaJSUseMainModuleInitializer := true
 libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "2.2.0"
diff --git a/scala-lagom/build.sbt b/scala-lagom/build.sbt
@@ -2,7 +2,7 @@ organization in ThisBuild := "com.baeldung"
 version in ThisBuild := "1.0-SNAPSHOT"
 
 // the Scala version that will be used for cross-compiled libraries
-scalaVersion in ThisBuild := "2.13.0"
+scalaVersion in ThisBuild := "2.13.10"
 
 val macwire = "com.softwaremill.macwire" %% "macros" % "2.3.3" % "provided"
 val scalaTest = "org.scalatest" %% "scalatest" % "3.1.1" % Test
diff --git a/scala-sbt/intro-to-sbt/build.sbt b/scala-sbt/intro-to-sbt/build.sbt
@@ -1,6 +1,6 @@
 import Dependencies._
 
-ThisBuild / scalaVersion := "2.13.8"
+ThisBuild / scalaVersion := "2.13.10"
 ThisBuild / version := "0.1.0-SNAPSHOT"
 
 lazy val printHello = taskKey[Unit]("prints hello")
diff --git a/scala-test-junit5/build.sbt b/scala-test-junit5/build.sbt
@@ -3,7 +3,7 @@ organization := "com.baeldung"
 
 version := "1.0-SNAPSHOT"
 
-scalaVersion := "2.13.6"
+scalaVersion := "2.13.10"
 
 resolvers += Resolver.jcenterRepo
 
diff --git a/scalatra/build.sbt b/scalatra/build.sbt
@@ -1,6 +1,6 @@
 val ScalatraVersion = "2.8.2"
 
-ThisBuild / scalaVersion := "2.13.4"
+ThisBuild / scalaVersion := "2.13.10"
 ThisBuild / organization := "baeldung"
 
 lazy val hello = (project in file("."))

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ lazy val root = (project in file("."))`
`9`	`9`	`jsEnv := new org.scalajs.jsenv.jsdomnodejs.JSDOMNodeJSEnv()`
`10`	`10`	`)`
`11`	`11`
`12`		`-scalaVersion := "2.13.1"`
	`12`	`+scalaVersion := "2.13.10"`
`13`	`13`
`14`	`14`	`scalaJSUseMainModuleInitializer := true`
`15`	`15`	`libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "2.2.0"`