Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

scala 2_12 and spark 3 support added #11

Merged
merged 3 commits into from
Mar 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
name := "dataframe-rules-engine"

organization := "com.databricks"
organization := "com.databricks.labs"

version := "0.1.1"
version := "0.1.2"

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

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

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

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


lazy val commonSettings = Seq(
version := "0.1.1",
organization := "com.databricks",
scalaVersion := "2.11.12"
version := "0.1.2",
organization := "com.databricks.labs",
scalaVersion := "2.12.12"
)
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ package com.databricks.labs.validation

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

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

class ValidatorTestSuite extends org.scalatest.FunSuite with SparkSessionFixture {
class ValidatorTestSuite extends AnyFunSuite with SparkSessionFixture {

import spark.implicits._
spark.sparkContext.setLogLevel("ERROR")
Expand Down