Skip to content

Commit

Permalink
Updated to scala 2.13 and spark 3.2.0-SNAPSHOT
Browse files Browse the repository at this point in the history
  • Loading branch information
skestle authored and Stephen Kestle committed May 14, 2021
1 parent 791606f commit c31c7b2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
10 changes: 6 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@ organization := "com.github.mrpowers"
name := "spark-daria"

version := "1.0.0"
crossScalaVersions := Seq("2.12.12")
scalaVersion := "2.12.12"
val sparkVersion = "3.0.1"
crossScalaVersions := Seq("2.13.5")
scalaVersion := crossScalaVersions.value.head
val sparkVersion = "3.2.0-SNAPSHOT"

resolvers += "Apache Snapshots" at "https://repository.apache.org/snapshots"

libraryDependencies += "org.apache.spark" %% "spark-sql" % sparkVersion % "provided"
libraryDependencies += "org.apache.spark" %% "spark-mllib" % sparkVersion % "provided"
libraryDependencies += "com.github.mrpowers" %% "spark-fast-tests" % "1.0.0" % "test"
libraryDependencies += "com.lihaoyi" %% "utest" % "0.6.3" % "test"
libraryDependencies += "com.lihaoyi" %% "utest" % "0.7.9" % "test"
libraryDependencies += "com.lihaoyi" %% "os-lib" % "0.7.1" % "test"
testFrameworks += new TestFramework("com.github.mrpowers.spark.daria.CustomFramework")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,9 @@ object functions {
val d = Option(delimiters).getOrElse(return None)
val c = Option(colName).getOrElse(return None)
// initialize the previousLetter to be the null character - the closest representation of the empty character: https://stackoverflow.com/questions/8306060/how-do-i-represent-an-empty-char-in-scala
var previousLetter: Char = '\0'
var previousLetter: Char = '\u0000'
Some(c.map { letter: Char =>
if (d.contains(previousLetter) || previousLetter.equals('\0')) {
if (d.contains(previousLetter) || previousLetter.equals('\u0000')) {
previousLetter = letter
letter.toUpper
} else {
Expand Down

0 comments on commit c31c7b2

Please sign in to comment.