Skip to content

Commit ee0081d

Browse files
authored
scala 2_12 and spark 3 support added (#11)
* scala 2_12 and spark 3 support added * correct namespace and rev version * updated scalatest namespace
1 parent fc0d7e8 commit ee0081d

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

build.sbt

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
name := "dataframe-rules-engine"
22

3-
organization := "com.databricks"
3+
organization := "com.databricks.labs"
44

5-
version := "0.1.1"
5+
version := "0.1.2"
66

7-
scalaVersion := "2.11.12"
7+
scalaVersion := "2.12.12"
88
scalacOptions ++= Seq("-Xmax-classfile-name", "78")
99

10-
libraryDependencies += "org.apache.spark" %% "spark-core" % "2.4.0"
11-
libraryDependencies += "org.apache.spark" %% "spark-sql" % "2.4.0"
12-
libraryDependencies += "org.scalactic" %% "scalactic" % "3.1.1"
13-
libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.1" % "test"
10+
libraryDependencies += "org.apache.spark" %% "spark-core" % "3.0.1" % Provided
11+
libraryDependencies += "org.apache.spark" %% "spark-sql" % "3.0.1" % Provided
12+
libraryDependencies += "org.scalactic" %% "scalactic" % "3.2.6"
13+
libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.6" % Test
1414

1515
lazy val excludes = jacocoExcludes in Test := Seq()
1616

@@ -31,7 +31,7 @@ testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, "-oD")
3131

3232

3333
lazy val commonSettings = Seq(
34-
version := "0.1.1",
35-
organization := "com.databricks",
36-
scalaVersion := "2.11.12"
34+
version := "0.1.2",
35+
organization := "com.databricks.labs",
36+
scalaVersion := "2.12.12"
3737
)

src/test/scala/com/databricks/labs/validation/ValidatorTestSuite.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ package com.databricks.labs.validation
22

33
import com.databricks.labs.validation.utils.Structures.{Bounds, MinMaxRuleDef}
44
import org.apache.spark.sql.functions.{col, min}
5+
import org.scalatest.funsuite.AnyFunSuite
56

67
case class ValidationValue(validDateTime: java.lang.Long, validNumerics: Array[Double], bounds: Array[Double], validStrings: Array[String])
78

8-
class ValidatorTestSuite extends org.scalatest.FunSuite with SparkSessionFixture {
9+
class ValidatorTestSuite extends AnyFunSuite with SparkSessionFixture {
910

1011
import spark.implicits._
1112
spark.sparkContext.setLogLevel("ERROR")

0 commit comments

Comments
 (0)