Skip to content

[SPARK-33048][BUILD] Fix SparkBuild.scala to recognize build settings for Scala 2.13 #29927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[SPARK-33048][BUILD] Fix SparkBuild.scala to recognize build settings for Scala 2.13 #29927

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24eed00
Modified SparkBuild.scala to support Scala 2.13.
sarutak Oct 1, 2020
833c2dd
Modified SparkBuild.scala to allow build with Scala 2.13 without both…
sarutak Oct 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 1 addition & 27 deletions project/SparkBuild.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,21 +94,6 @@ object SparkBuild extends PomBuild {
case Some(v) =>
v.split("(\\s+|,)").filterNot(_.isEmpty).map(_.trim.replaceAll("-P", "")).toSeq
}

// TODO: revisit for Scala 2.13 support
/*
Option(System.getProperty("scala.version"))
.filter(_.startsWith("2.11"))
.foreach { versionString =>
System.setProperty("scala-2.11", "true")
}
if (System.getProperty("scala-2.11") == "") {
// To activate scala-2.10 profile, replace empty property value to non-empty value
// in the same way as Maven which handles -Dname as -Dname=true before executes build process.
// see: https://github.com/apache/maven/blob/maven-3.0.4/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java#L1082
System.setProperty("scala-2.11", "true")
}
*/
profiles
}

Expand Down Expand Up @@ -965,17 +950,6 @@ object CopyDependencies {

object TestSettings {
import BuildCommons._

// TODO revisit for Scala 2.13 support
private val scalaBinaryVersion = "2.12"
/*
if (System.getProperty("scala-2.11") == "true") {
"2.11"
} else {
"2.12"
}
*/

private val defaultExcludedTags = Seq("org.apache.spark.tags.ChromeUITest")

lazy val settings = Seq (
Expand All @@ -988,7 +962,7 @@ object TestSettings {
(fullClasspath in Test).value.files.map(_.getAbsolutePath)
.mkString(File.pathSeparator).stripSuffix(File.pathSeparator),
"SPARK_PREPEND_CLASSES" -> "1",
"SPARK_SCALA_VERSION" -> scalaBinaryVersion,
"SPARK_SCALA_VERSION" -> scalaBinaryVersion.value,
"SPARK_TESTING" -> "1",
"JAVA_HOME" -> sys.env.get("JAVA_HOME").getOrElse(sys.props("java.home"))),
javaOptions in Test += s"-Djava.io.tmpdir=$testTempDir",
Expand Down