diff options
| author | Mark Hamstra <markhamstra@gmail.com> | 2014-04-01 18:35:50 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@databricks.com> | 2014-04-01 18:35:50 -0700 |
| commit | 764353d2c5162352781c273dd3d4af6a309190c7 (patch) | |
| tree | a9163a04b3e62fed5de67a490882ef8e64d536b2 /project | |
| parent | f5c418da044ef7f3d7185cc5bb1bef79d7f4e25c (diff) | |
| download | spark-764353d2c5162352781c273dd3d4af6a309190c7.tar.gz spark-764353d2c5162352781c273dd3d4af6a309190c7.tar.bz2 spark-764353d2c5162352781c273dd3d4af6a309190c7.zip | |
[SPARK-1342] Scala 2.10.4
Just a Scala version increment
Author: Mark Hamstra <markhamstra@gmail.com>
Closes #259 from markhamstra/scala-2.10.4 and squashes the following commits:
fbec547 [Mark Hamstra] [SPARK-1342] Bumped Scala version to 2.10.4
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 2 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 | ||||
| -rw-r--r-- | project/project/SparkPluginBuild.scala | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 7457ff456a..c5c697e8e2 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -152,7 +152,7 @@ object SparkBuild extends Build { def sharedSettings = Defaults.defaultSettings ++ MimaBuild.mimaSettings(file(sparkHome)) ++ Seq( organization := "org.apache.spark", version := SPARK_VERSION, - scalaVersion := "2.10.3", + scalaVersion := "2.10.4", scalacOptions := Seq("-Xmax-classfile-name", "120", "-unchecked", "-deprecation", "-target:" + SCALAC_JVM_VERSION), javacOptions := Seq("-target", JAVAC_JVM_VERSION, "-source", JAVAC_JVM_VERSION), diff --git a/project/plugins.sbt b/project/plugins.sbt index 5aa8a1ec24..d787237ddc 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.10.3" +scalaVersion := "2.10.4" resolvers += Resolver.url("artifactory", url("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns) diff --git a/project/project/SparkPluginBuild.scala b/project/project/SparkPluginBuild.scala index 5a307044ba..0142256e90 100644 --- a/project/project/SparkPluginBuild.scala +++ b/project/project/SparkPluginBuild.scala @@ -32,7 +32,7 @@ object SparkPluginDef extends Build { name := "spark-style", organization := "org.apache.spark", version := sparkVersion, - scalaVersion := "2.10.3", + scalaVersion := "2.10.4", scalacOptions := Seq("-unchecked", "-deprecation"), libraryDependencies ++= Dependencies.scalaStyle ) |