Repository: spark Updated Branches: refs/heads/branch-1.4 53f119cc5 -> af69c4c90
[SPARK-10556] Remove explicit Scala version for sbt project build files Previously, project/plugins.sbt explicitly set scalaVersion to 2.10.4. This can cause issues when using a version of sbt that is compiled against a different version of Scala (for example sbt 0.13.9 uses 2.10.5). Removing this explicit setting will cause build files to be compiled and run against the same version of Scala that sbt is compiled against. Note that this only applies to the project build files (items in project/), it is distinct from the version of Scala we target for the actual spark compilation. Author: Ahir Reddy <ahirre...@gmail.com> Closes #8709 from ahirreddy/sbt-scala-version-fix. (cherry picked from commit 9bbe33f318c866c0b13088917542715062f0787f) Signed-off-by: Sean Owen <so...@cloudera.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/af69c4c9 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/af69c4c9 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/af69c4c9 Branch: refs/heads/branch-1.4 Commit: af69c4c901409cb4e9485fc1744bf0ac318be8d4 Parents: 53f119c Author: Ahir Reddy <ahirre...@gmail.com> Authored: Fri Sep 11 13:06:14 2015 +0100 Committer: Sean Owen <so...@cloudera.com> Committed: Fri Sep 11 13:06:41 2015 +0100 ---------------------------------------------------------------------- project/plugins.sbt | 2 -- 1 file changed, 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/af69c4c9/project/plugins.sbt ---------------------------------------------------------------------- diff --git a/project/plugins.sbt b/project/plugins.sbt index 75bd604..909e715 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,3 @@ -scalaVersion := "2.10.4" - resolvers += Resolver.url("artifactory", url("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases";))(Resolver.ivyStylePatterns) resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/"; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
