Repository: spark Updated Branches: refs/heads/branch-1.3 d0d7ada9f -> 8c8d7ab20
[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/8c8d7ab2 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/8c8d7ab2 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/8c8d7ab2 Branch: refs/heads/branch-1.3 Commit: 8c8d7ab20127c0752ec115dfc6901d2d8fc4e79f Parents: d0d7ada 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:55 2015 +0100 ---------------------------------------------------------------------- project/plugins.sbt | 2 -- 1 file changed, 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/8c8d7ab2/project/plugins.sbt ---------------------------------------------------------------------- diff --git a/project/plugins.sbt b/project/plugins.sbt index ee45b6a..45366b1 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
