Skip to content

Commit

Permalink
Update to Spark 2.3.0, also update sbt.version to 0.13.16
Browse files Browse the repository at this point in the history
  • Loading branch information
holdenk committed Mar 16, 2018
1 parent 0ebf978 commit 34d5f78
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ publishMavenStyle := true

version := "0.8.1"

sparkVersion := "2.2.1"
sparkVersion := "2.3.0"

scalaVersion := {
if (sparkVersion.value >= "2.0.0") {
Expand Down Expand Up @@ -60,8 +60,8 @@ coverageHighlighting := {
else true
}

scalastyleSources in Compile <++= unmanagedSourceDirectories in Compile
scalastyleSources in Test <++= unmanagedSourceDirectories in Test
scalastyleSources in Compile ++= {unmanagedSourceDirectories in Compile}.value
scalastyleSources in Test ++= {unmanagedSourceDirectories in Test}.value

// Allow kafka (and other) utils to have version specific files
unmanagedSourceDirectories in Compile := {
Expand Down
2 changes: 1 addition & 1 deletion mini-cross-build.pl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
use File::Slurp;
use strict;
use warnings;
my @spark_versions = ("1.4.0", "1.4.1", "1.5.0", "1.5.1", "1.5.2", "1.6.0", "1.6.1", "1.6.2", "1.6.3", "2.0.0", "2.0.1", "2.0.2", "2.1.0", "2.1.1", "2.2.0", "2.2.1");
my @spark_versions = ("1.4.0", "1.4.1", "1.5.0", "1.5.1", "1.5.2", "1.6.0", "1.6.1", "1.6.2", "1.6.3", "2.0.0", "2.0.1", "2.0.2", "2.1.0", "2.1.1", "2.2.0", "2.2.1", "2.3.0");
# Backup the build file
`cp build.sbt build.sbt_back`;
# Get the original version
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.15
sbt.version=0.13.16
2 changes: 1 addition & 1 deletion sbt/sbt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# This script launches sbt for this project. If present it uses the system
# version of sbt. If there is no system version of sbt it attempts to download
# sbt locally.
SBT_VERSION=0.13.15
SBT_VERSION=0.13.16
URL1=http://typesafe.artifactoryonline.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${SBT_VERSION}/sbt-launch.jar
URL2=http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${SBT_VERSION}/sbt-launch.jar
JAR=sbt/sbt-launch-${SBT_VERSION}.jar
Expand Down

0 comments on commit 34d5f78

Please sign in to comment.