Skip to content

Commit

Permalink
Spark version updated, now scala 2.12 supported 😊 (#13)
Browse files Browse the repository at this point in the history
  • Loading branch information
alfonsorr authored Aug 13, 2019
1 parent 638341c commit f4de956
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
language: scala
scala:
- 2.11.12
#- 2.12.8
# holden's library not yet for 2.12
- 2.12.9
sudo: required
dist: trusty
group: edge
Expand All @@ -13,7 +11,7 @@ before_install:
stages:
- name: +test
- name: release
if: (branch = master AND type = push) OR (tag IS present)
if: (branch = master AND type = push) OR (tag IS present and branch != binder)

jobs:
include:
Expand Down
9 changes: 5 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name := "spark-optics"

scalaVersion := "2.11.12"
scalaVersion := "2.12.9"

crossScalaVersions := Seq("2.11.12")//, "2.12.8")
crossScalaVersions := Seq("2.11.12", "2.12.9")

parallelExecution in Test := false
fork in Test := true
Expand All @@ -12,11 +12,12 @@ javaOptions ++= Seq("-Xms512M",
"-XX:+CMSClassUnloadingEnabled")

libraryDependencies ++= {
val sparkVersion = "2.3.1"
val sparkVersion = "2.4.2"
val sparkTestVersion = "0.12.0"
Seq(
"org.apache.spark" %% "spark-sql" % sparkVersion % "provided",
"org.scalatest" %% "scalatest" % "3.0.5" % "test",
"com.holdenkarau" %% "spark-testing-base" % s"${sparkVersion}_0.10.0" % "test",
"com.holdenkarau" %% "spark-testing-base" % s"${sparkVersion}_$sparkTestVersion" % "test",
"org.apache.spark" %% "spark-hive" % sparkVersion % "test"
)
}
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 = 1.2.7
sbt.version = 1.2.8

0 comments on commit f4de956

Please sign in to comment.