From e8aa132bb82ead5b195e99e2b0008dc5b70f6162 Mon Sep 17 00:00:00 2001
From: ludatabricks <38018689+ludatabricks@users.noreply.github.com>
Date: Fri, 15 Jun 2018 06:40:14 -0700
Subject: [PATCH] [ML-3870] Make spark-sql-perf master compiled with spark 2.3
 and scala 2.11 (#155)

Change the build config to update spark 2.3 and update the scala dependence in bin/spark-perf
---
 .travis.yml    | 2 ++
 bin/spark-perf | 4 ++--
 build.sbt      | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f0cff8a..1e84fb9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,6 @@
 language: scala
+scala:
+  - 2.11.8
 sudo: false
 jdk:
   oraclejdk8
diff --git a/bin/spark-perf b/bin/spark-perf
index eade724..d493715 100755
--- a/bin/spark-perf
+++ b/bin/spark-perf
@@ -5,5 +5,5 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 VERSION=`git -C $DIR/../ tag | tail -n 1 | cut -c 2-`
-ARGS="sparkPackage com.databricks:spark-sql-perf_2.10:$VERSION com.databricks.spark.sql.perf.RunBenchmark $@"
-build/sbt "$ARGS"
\ No newline at end of file
+ARGS="sparkPackage com.databricks:spark-sql-perf_2.11:$VERSION com.databricks.spark.sql.perf.RunBenchmark $@"
+build/sbt "$ARGS"
diff --git a/build.sbt b/build.sbt
index 825dd03..52d4bdd 100644
--- a/build.sbt
+++ b/build.sbt
@@ -7,14 +7,14 @@ organization := "com.databricks"
 
 scalaVersion := "2.11.8"
 
-crossScalaVersions := Seq("2.10.6", "2.11.8")
+crossScalaVersions := Seq("2.11.8")
 
 sparkPackageName := "databricks/spark-sql-perf"
 
 // All Spark Packages need a license
 licenses := Seq("Apache-2.0" -> url("http://opensource.org/licenses/Apache-2.0"))
 
-sparkVersion := "2.2.0"
+sparkVersion := "2.3.0"
 
 sparkComponents ++= Seq("sql", "hive", "mllib")