Skip to content

Commit

Permalink
Merge pull request #16 from badrinathpatchikolla/spark-3.1
Browse files Browse the repository at this point in the history
Added Spark 3.1 Changes
  • Loading branch information
badrinathpatchikolla authored Mar 29, 2022
2 parents 8920ac1 + c7e94e1 commit 50b50d6
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 9 deletions.
1 change: 1 addition & 0 deletions .bsp/sbt.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"name":"sbt","version":"1.6.2","bspVersion":"2.0.0-M5","languages":["scala"],"argv":["/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java","-Xms100m","-Xmx100m","-classpath","/home/badri/.local/share/JetBrains/IdeaIC2021.3/Scala/launcher/sbt-launch.jar","-Dsbt.script=/usr/bin/sbt","xsbt.boot.Boot","-bsp"]}
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ language: scala
jdk: openjdk8

scala:
- 2.11.12
- 2.12.15

cache:
directories:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

[![Build Status](https://travis-ci.com/modakanalytics/http.almaren.svg?token=TEB3zRDqVUuChez9334q&branch=master)](https://travis-ci.com/modakanalytics/http.almaren)
```
libraryDependencies += "com.github.music-of-the-ainur" %% "http-almaren" % "1.2.2-$SPARK_VERSION"
libraryDependencies += "com.github.music-of-the-ainur" %% "http-almaren" % "1.2.3-$SPARK_VERSION"
```

```
spark-shell --master "local[*]" --packages "com.github.music-of-the-ainur:almaren-framework_2.11:0.9.2-$SPARK_VERSION,com.github.music-of-the-ainur:http-almaren_2.11:1.2.2-$SPARK_VERSION"
spark-shell --master "local[*]" --packages "com.github.music-of-the-ainur:almaren-framework_2.12:0.9.3-$SPARK_VERSION,com.github.music-of-the-ainur:http-almaren_2.12:1.2.3-$SPARK_VERSION"
```
## Table of Contents

Expand Down
14 changes: 9 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
ThisBuild / name := "http.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.8"
val sparkVersion = "3.1.3"
val majorVersionReg = "([0-9]+\\.[0-9]+).{0,}".r

val majorVersionReg(majorVersion) = sparkVersion
Expand All @@ -17,7 +15,7 @@ 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" % s"0.9.2-${majorVersion}" % "provided",
"com.github.music-of-the-ainur" %% "almaren-framework" % s"0.9.3-${majorVersion}" % "provided",
"com.lihaoyi" %% "requests" % "0.7.0",
"com.typesafe.scala-logging" %% "scala-logging" % "3.9.0",
"org.scalatest" %% "scalatest" % "3.0.5" % "test"
Expand All @@ -38,6 +36,12 @@ ThisBuild / developers := List(
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")
),
Developer(
id = "praveenkumarb1207",
name = "Praveen Kumar",
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.3.7
sbt.version=1.6.2

0 comments on commit 50b50d6

Please sign in to comment.