Merge pull request #10 from badrinathpatchikolla/spark-3.1

Spark 3.1

Author: badrinathpatchikolla

.travis.yml

@@ -3,7 +3,7 @@ language: scala
 jdk: openjdk8
 
 scala:
-  - 2.11.12
+  - 2.12.15
 
 cache:
   directories:

README.md

@@ -3,15 +3,21 @@
 [![Build Status](https://travis-ci.com/modakanalytics/bigquery.almaren.svg?branch=master)](https://travis-ci.com/modakanalytics/bigquery.almaren)
 
 ```
-libraryDependencies += "com.github.music-of-the-ainur" %% "bigquery-almaren" % "0.0.4-2.4"
+libraryDependencies += "com.github.music-of-the-ainur" %% "bigquery-almaren" % "0.0.5-3.1"
+```
+
+To run in spark-shell:
+
+```
+spark-shell --packages "com.github.music-of-the-ainur:bigquery-almaren_2.12:0.0.5-$SPARK_VERSION,com.github.music-of-the-ainur:almaren-framework_2.12:0.9.3-$SPARK_VERSION"
 ```
 
 BigQuery Connector was implemented using [https://github.com/GoogleCloudDataproc/spark-bigquery-connector](https://github.com/GoogleCloudDataproc/spark-bigquery-connector).
 For more details check the following [link](https://github.com/GoogleCloudDataproc/spark-bigquery-connector).
 
 ```
 
-spark-shell --master "local[*]" --packages "com.github.music-of-the-ainur:almaren-framework_2.11:0.9.2-2.4,com.github.music-of-the-ainur:bigquery-almaren_2.11:0.0.4-2.4"
+spark-shell --master "local[*]" --packages "com.github.music-of-the-ainur:almaren-framework_2.12:0.9.3-3.1,com.github.music-of-the-ainur:bigquery-almaren_2.12:0.0.5-3.1"
 
 ```
 

build.sbt

@@ -1,20 +1,21 @@
 ThisBuild / name := "bigquery.almaren"
 ThisBuild / organization := "com.github.music-of-the-ainur"
 
-lazy val scala211 = "2.11.12"
-lazy val scala212 = "2.12.10"
+lazy val scala212 = "2.12.15"
 
-crossScalaVersions := Seq(scala211,scala212)
 ThisBuild / scalaVersion := scala212
 
-val sparkVersion = "2.4.0"
+val sparkVersion = "3.1.3"
+val majorVersionReg = "([0-9]+\\.[0-9]+).{0,}".r
+
+val majorVersionReg(majorVersion) = sparkVersion
 
 scalacOptions ++= Seq("-deprecation", "-feature")
 
 libraryDependencies ++= Seq(
   "org.apache.spark" %% "spark-core" % sparkVersion % "provided",
   "org.apache.spark" %% "spark-sql" % sparkVersion % "provided",
-  "com.github.music-of-the-ainur" %% "almaren-framework" % "0.9.2-2.4" % "provided",
+  "com.github.music-of-the-ainur" %% "almaren-framework" % s"0.9.3-${majorVersion}" % "provided",
   "com.google.cloud.spark" %% "spark-bigquery-with-dependencies" % "0.23.2",
   "com.typesafe.scala-logging" %% "scala-logging" % "3.9.0",
   "org.scalatest" %% "scalatest" % "3.0.5" % "test"
@@ -39,6 +40,12 @@ ThisBuild / developers := List(
     name  = "Daniel Mantovani",
     email = "[email protected]",
     url   = url("https://github.com/music-of-the-ainur")
+  ),
+  Developer(
+    id = "badrinathpatchikolla",
+    name = "Badrinath Patchikolla",
+    email = "[email protected]",
+    url = url("https://github.com/music-of-the-ainur")
   )
 )
 
@@ -48,8 +55,6 @@ ThisBuild / homepage := Some(url("https://github.com/modakanalytics/bigquery.alm
 ThisBuild / organizationName := "Modak Analytics"
 ThisBuild / organizationHomepage := Some(url("https://github.com/modakanalytics"))
 
-
-// Remove all additional repository other than Maven Central from POM
 // Remove all additional repository other than Maven Central from POM
 credentials += Credentials(Path.userHome / ".sbt" / "sonatype_credential")