Skip to content

Commit

Permalink
bump deps, cross-build 2.12, upgrade to spark 2.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ryan-williams committed Dec 29, 2018
1 parent 4616dab commit f1af176
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jdk:
- oraclejdk8

scala:
- 2.11.12
- 2.12.8

script: sbt clean test

Expand Down
15 changes: 7 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
name := "magic-rdds"

v"4.2.3"
v"4.3.0"

spark

Expand All @@ -10,17 +9,17 @@ scalameta
emptyDocJar

dep(
bytes % "1.2.0",
bytes % "1.3.0",
case_app,
io_utils % "5.1.1",
io_utils % "5.2.1",
iterators % "2.2.0",
iterators.macros % "1.0.0",
math.utils % "2.2.0",
math.utils % "2.3.0",
paths % "1.5.0",
slf4j,
spark_util % "3.0.0",
spark_util % "3.1.0",
spire,
stats % "1.3.1",
types % "1.2.0",
stats % "1.3.3",
types % "1.4.0",
parallel % "1.0.0" +testtest
)
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.1.5
sbt.version=1.2.7
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("org.hammerlab.sbt" % "base" % "4.6.2")
addSbtPlugin("org.hammerlab.sbt" % "base" % "4.6.8")
20 changes: 10 additions & 10 deletions src/main/scala/org/hammerlab/magic/rdd/cmp/Unordered.scala
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,18 @@ class Unordered[T: ClassTag] private(joined: RDD[(T, (Long, Long))])
lazy val isEqual = stats.isEqual

lazy val aOnly =
for {
(e, (a, b)) joined
if a > b
} yield
e (a - b)
joined.collect {
case (e, (a, b))
if a > b
e (a - b)
}

lazy val bOnly =
for {
(e, (a, b)) joined
if b > a
} yield
e (b - a)
joined.collect {
case (e, (a, b))
if b > a
e (b - a)
}
}


Expand Down

0 comments on commit f1af176

Please sign in to comment.