From 474a3f3209b74ff669673568fa8bea3d45a6d46d Mon Sep 17 00:00:00 2001 From: Grigory Pomadchin Date: Tue, 9 Nov 2021 21:33:14 -0500 Subject: [PATCH] Make cross spark tests acutally work --- build.sbt | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/build.sbt b/build.sbt index 2d2fc8bd..d75c9762 100644 --- a/build.sbt +++ b/build.sbt @@ -79,16 +79,16 @@ lazy val cats = project .settings(catsSettings) .dependsOn(dataset % "test->test;compile->compile;provided->provided") -lazy val `cats-spark31` = (project in file("cats")) +lazy val `cats-spark31` = project .settings(name := "frameless-cats-spark31") - .settings(target := file("cats-spark31/target")) + .settings(sourceDirectory := (cats / sourceDirectory).value) .settings(catsSettings) .settings(mimaPreviousArtifacts := Set.empty) .dependsOn(`dataset-spark31` % "test->test;compile->compile;provided->provided") -lazy val `cats-spark30` = (project in file("cats")) +lazy val `cats-spark30` = project .settings(name := "frameless-cats-spark30") - .settings(target := file("cats-spark30/target")) + .settings(sourceDirectory := (cats / sourceDirectory).value) .settings(catsSettings) .settings(mimaPreviousArtifacts := Set.empty) .dependsOn(`dataset-spark30` % "test->test;compile->compile;provided->provided") @@ -99,17 +99,17 @@ lazy val dataset = project .settings(sparkDependencies(sparkVersion)) .dependsOn(core % "test->test;compile->compile") -lazy val `dataset-spark31` = (project in file("dataset")) +lazy val `dataset-spark31` = project .settings(name := "frameless-dataset-spark31") - .settings(target := file("dataset-spark31/target")) + .settings(sourceDirectory := (dataset / sourceDirectory).value) .settings(datasetSettings) .settings(sparkDependencies(spark31Version)) .settings(mimaPreviousArtifacts := Set.empty) .dependsOn(core % "test->test;compile->compile") -lazy val `dataset-spark30` = (project in file("dataset")) +lazy val `dataset-spark30` = project .settings(name := "frameless-dataset-spark30") - .settings(target := file("dataset-spark30/target")) + .settings(sourceDirectory := (dataset / sourceDirectory).value) .settings(datasetSettings) .settings(sparkDependencies(spark30Version)) .settings(mimaPreviousArtifacts := Set.empty) @@ -120,15 +120,15 @@ lazy val refined = project .settings(refinedSettings) .dependsOn(dataset % "test->test;compile->compile;provided->provided") -lazy val `refined-spark31` = (project in file("refined")) +lazy val `refined-spark31` = project .settings(name := "frameless-refined-spark31") - .settings(target := file("refined-spark31/target")) + .settings(sourceDirectory := (refined / sourceDirectory).value) .settings(refinedSettings) .dependsOn(`dataset-spark31` % "test->test;compile->compile;provided->provided") -lazy val `refined-spark30` = (project in file("refined")) +lazy val `refined-spark30` = project .settings(name := "frameless-refined-spark30") - .settings(target := file("refined-spark30/target")) + .settings(sourceDirectory := (refined / sourceDirectory).value) .settings(refinedSettings) .dependsOn(`dataset-spark30` % "test->test;compile->compile;provided->provided") @@ -141,9 +141,9 @@ lazy val ml = project dataset % "test->test;compile->compile;provided->provided" ) -lazy val `ml-spark31` = (project in file("ml")) +lazy val `ml-spark31` = project .settings(name := "frameless-ml-spark31") - .settings(target := file("ml-spark31/target")) + .settings(sourceDirectory := (ml / sourceDirectory).value) .settings(mlSettings) .settings(sparkMlDependencies(spark31Version)) .settings(mimaPreviousArtifacts := Set.empty) @@ -152,9 +152,9 @@ lazy val `ml-spark31` = (project in file("ml")) `dataset-spark31` % "test->test;compile->compile;provided->provided" ) -lazy val `ml-spark30` = (project in file("ml")) +lazy val `ml-spark30` = project .settings(name := "frameless-ml-spark30") - .settings(target := file("ml-spark30/target")) + .settings(sourceDirectory := (ml / sourceDirectory).value) .settings(mlSettings) .settings(sparkMlDependencies(spark30Version)) .settings(mimaPreviousArtifacts := Set.empty)