Merge pull request #103 from thunterdb/95-update

[95] Official release numbers

Makefile

@@ -1,7 +1,10 @@
-all: 1.4.1 1.5.2 1.6.2 2.0.0
+all: 2.0.0s2.10 1.4.1 1.5.2 1.6.2 2.0.0
 
 clean:
 	rm -rf target/graphframes_*.zip
 
 1.4.1 1.5.2 1.6.2 2.0.0:
 	build/sbt -Dspark.version=$@ spDist
+
+2.0.0s2.10:
+	build/sbt -Dspark.version=2.0.0 -Dscala.version=2.10.4 spDist assembly test

build.sbt

@@ -11,9 +11,8 @@ val defaultScalaVer = sparkBranch match {
 }
 val scalaVer = sys.props.getOrElse("scala.version", defaultScalaVer)
 val defaultScalaTestVer = scalaVer match {
-  case "2.10.4" => "2.0"
-  case "2.10.5" => "2.0"
-  case "2.11.7" => "2.2.6" // scalatest_2.11 does not have 2.0 published
+  case s if s.startsWith("2.10") => "2.0"
+  case s if s.startsWith("2.11") => "2.2.6" // scalatest_2.11 does not have 2.0 published
 }
 
 sparkVersion := sparkVer
@@ -23,11 +22,12 @@ scalaVersion := scalaVer
 spName := "graphframes/graphframes"
 
 // Don't forget to set the version
-version := s"0.2.0-spark$sparkBranch-SNAPSHOT"
+version := s"0.2.0-spark$sparkBranch"
 
 // All Spark Packages need a license
 licenses := Seq("Apache-2.0" -> url("http://opensource.org/licenses/Apache-2.0"))
 
+spAppendScalaVersion := true
 
 // Add Spark components this package depends on, e.g, "mllib", ....
 sparkComponents ++= Seq("graphx", "sql")