Skip to content

Commit

Permalink
Add support for scala 2.13 (#417)
Browse files Browse the repository at this point in the history
Only adds scala CI builds as I don't belive there is any pre-built
pyspark release using scala 2.13.
  • Loading branch information
eejbyfeldt committed Feb 22, 2023
1 parent 82f7979 commit 3d76998
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/scala-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@ jobs:
fail-fast: false
matrix:
include:
- spark-version: 3.3.2
scala-version: 2.13.10
- spark-version: 3.3.2
scala-version: 2.12.12
- spark-version: 3.2.3
scala-version: 2.12.12
- spark-version: 3.2.3
scala-version: 2.13.10
- spark-version: 3.1.3
scala-version: 2.12.12
- spark-version: 3.0.3
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ val defaultScalaVer = sparkBranch match {
}
val scalaVer = sys.props.getOrElse("scala.version", defaultScalaVer)
val defaultScalaTestVer = scalaVer match {
case s if s.startsWith("2.12") => "3.0.8"
case s if s.startsWith("2.12") || s.startsWith("2.13") => "3.0.8"
case s if s.startsWith("2.11") => "2.2.6" // scalatest_2.11 does not have 2.0 published
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/org/graphframes/lib/ShortestPaths.scala
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class ShortestPaths private[graphframes] (private val graph: GraphFrame) extends
* The list of landmark vertex ids. Shortest paths will be computed to each landmark.
*/
def landmarks(value: util.ArrayList[Any]): this.type = {
landmarks(value.asScala)
landmarks(value.asScala.toSeq)
}

def run(): DataFrame = {
Expand Down

0 comments on commit 3d76998

Please sign in to comment.