Add support for scala 2.13 (#417)

Emil Ejbyfeldt · web-flow · commit 3d7699823e31 · 2023-02-22T11:45:40.000+08:00
Only adds scala CI builds as I don't belive there is any pre-built
pyspark release using scala 2.13.
diff --git a/.github/workflows/scala-ci.yml b/.github/workflows/scala-ci.yml
@@ -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
diff --git a/build.sbt b/build.sbt
@@ -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
 }
 
diff --git a/src/main/scala/org/graphframes/lib/ShortestPaths.scala b/src/main/scala/org/graphframes/lib/ShortestPaths.scala
@@ -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 = {

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ val defaultScalaVer = sparkBranch match {`
`16`	`16`	`}`
`17`	`17`	`val scalaVer = sys.props.getOrElse("scala.version", defaultScalaVer)`
`18`	`18`	`val defaultScalaTestVer = scalaVer match {`
`19`		`- case s if s.startsWith("2.12") => "3.0.8"`
	`19`	`+ case s if s.startsWith("2.12") \|\| s.startsWith("2.13") => "3.0.8"`
`20`	`20`	`case s if s.startsWith("2.11") => "2.2.6" // scalatest_2.11 does not have 2.0 published`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ class ShortestPaths private[graphframes] (private val graph: GraphFrame) extends`
`54`	`54`	`* The list of landmark vertex ids. Shortest paths will be computed to each landmark.`
`55`	`55`	`*/`
`56`	`56`	`def landmarks(value: util.ArrayList[Any]): this.type = {`
`57`		`- landmarks(value.asScala)`
	`57`	`+ landmarks(value.asScala.toSeq)`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`def run(): DataFrame = {`