Skip to content

Commit

Permalink
Prepare for 0.8.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
dwestheide committed Jan 26, 2019
1 parent a6d4c60 commit 020d936
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ script:
- sbt -Dkontextfrei.spark.version=2.0.2 clean test
- sbt -Dkontextfrei.spark.version=2.1.3 clean test
- sbt -Dkontextfrei.spark.version=2.2.3 clean test
- sbt -Dkontextfrei.spark.version=2.3.2 clean coverage test coverageReport && sbt coverageAggregate
- sbt -Dkontextfrei.spark.version=2.3.2
- sbt -Dkontextfrei.spark.version=2.4.0 clean coverage test coverageReport && sbt coverageAggregate
after_success:
- bash <(curl -s https://codecov.io/bash)
5 changes: 3 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ sparkVersion in ThisBuild := sys.props.getOrElse("kontextfrei.spark.version",
// This check will have to be made more robust when 2.5.0 comes out
def scalaVersions(sparkVersion: String): Seq[String] = {
if (sparkVersion.startsWith("2.4")) Seq("2.11.12", "2.12.8")
else if (sparkVersion.startsWith("2.3")) Seq("2.11.12")
else Seq("2.11.12", "2.10.7")
}

val common = Seq(
organization := "com.danielwestheide",
normalizedName := normalizedName.value + "-spark-" + sparkVersion.value,
version := "0.7.2-SNAPSHOT",
version := "0.8.0",
scalaVersion := "2.11.12",
crossScalaVersions := scalaVersions(sparkVersion.value),
licenses += ("Apache-2.0",
Expand All @@ -38,7 +39,7 @@ def spark(version: String, scalaVersion: String) = {
// out how to make a dependent build only for those combinations of Scala
// and Spark version that actually exist
if (scalaVersion.startsWith("2.12") && !version.startsWith("2.4")) sys.exit(0)
else if (version.startsWith("2.4") && scalaVersion.startsWith("2.10")) sys.exit(0)
else if ((version.startsWith("2.4") || version.startsWith("2.3")) && scalaVersion.startsWith("2.10")) sys.exit(0)
else "org.apache.spark" %% "spark-core" % version % "provided"
}

Expand Down

0 comments on commit 020d936

Please sign in to comment.