typelevel#755 - spark 3.5.0 version - build root 34 fix

chris-twiner · chris-twiner · commit 89ec302d1c7d · 2023-09-25T13:08:30.000+02:00
diff --git a/build.sbt b/build.sbt
@@ -120,11 +120,12 @@ lazy val dataset = project
 
 lazy val `dataset-spark34` = project
   .settings(name := "frameless-dataset-spark34")
+  .settings(sourceDirectory := (dataset / sourceDirectory).value)
   .settings(
-    Compile / unmanagedSourceDirectories += baseDirectory.value / "src" / "main" / "spark-3.4+"
+    Compile / unmanagedSourceDirectories += (dataset / baseDirectory).value / "src" / "main" / "spark-3.4+"
   )
   .settings(
-    Test / unmanagedSourceDirectories += baseDirectory.value / "src" / "test" / "spark-3.3+"
+    Test / unmanagedSourceDirectories += (dataset / baseDirectory).value / "src" / "test" / "spark-3.3+"
   )
   .settings(datasetSettings)
   .settings(sparkDependencies(spark34Version))

Original file line number	Diff line number	Diff line change
`@@ -120,11 +120,12 @@ lazy val dataset = project`
`120`	`120`
`121`	`121`	lazy val `dataset-spark34` = project
`122`	`122`	`.settings(name := "frameless-dataset-spark34")`
	`123`	`+ .settings(sourceDirectory := (dataset / sourceDirectory).value)`
`123`	`124`	`.settings(`
`124`		`- Compile / unmanagedSourceDirectories += baseDirectory.value / "src" / "main" / "spark-3.4+"`
	`125`	`+ Compile / unmanagedSourceDirectories += (dataset / baseDirectory).value / "src" / "main" / "spark-3.4+"`
`125`	`126`	`)`
`126`	`127`	`.settings(`
`127`		`- Test / unmanagedSourceDirectories += baseDirectory.value / "src" / "test" / "spark-3.3+"`
	`128`	`+ Test / unmanagedSourceDirectories += (dataset / baseDirectory).value / "src" / "test" / "spark-3.3+"`
`128`	`129`	`)`
`129`	`130`	`.settings(datasetSettings)`
`130`	`131`	`.settings(sparkDependencies(spark34Version))`