Skip to content

Commit 2d22e66

Browse files
Merge pull request #107 from astrolabsoftware/iterableFix
Compiling against Apache Spark 2.3.2: fix incompatibilities
2 parents 371d015 + 72bc363 commit 2d22e66

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ lazy val root = (project in file(".")).
4343
// assemblyShadeRules in assembly := Seq(ShadeRule.rename("nom.**" -> "new_nom.@1").inAll),
4444
// Put dependencies of the library
4545
libraryDependencies ++= Seq(
46-
"org.apache.spark" %% "spark-core" % "2.1.0" % "provided",
47-
"org.apache.spark" %% "spark-sql" % "2.1.0" % "provided",
46+
"org.apache.spark" %% "spark-core" % "2.3.2" % "provided",
47+
"org.apache.spark" %% "spark-sql" % "2.3.2" % "provided",
4848
// For loading FITS files
4949
"com.github.astrolabsoftware" %% "spark-fits" % "0.7.0",
5050
// "org.datasyslab" % "geospark" % "1.1.3",

src/main/scala/com/spark3d/utils/Utils.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,6 @@ object Utils {
171171
val ordering = new GuavaOrdering[T] {
172172
override def compare(l: T, r: T): Int = ord.compare(l, r)
173173
}
174-
ordering.leastOf(input.asJava, num).iterator.asScala
174+
ordering.leastOf(input.toIterable.asJava, num).iterator.asScala
175175
}
176176
}

0 commit comments

Comments
 (0)