diff --git a/README.md b/README.md index 5871419..5ea0be3 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ This library supports different versions of Spark: | This library | Spark Version | | ------------ | ------------- | +| 0.7.x | 3.1.x | | 0.6.x | 2.3.x, 2.4.x | | 0.5.x | 2.0.x | | 0.4.x | 1.6.x | diff --git a/build.sbt b/build.sbt index c01d73a..ec568e7 100644 --- a/build.sbt +++ b/build.sbt @@ -2,11 +2,11 @@ name := "spark-google-spreadsheets" organization := "com.github.potix2" -scalaVersion := "2.11.12" +scalaVersion := "2.12.13" -crossScalaVersions := Seq("2.11.12") +crossScalaVersions := Seq("2.12.13") -version := "0.6.4-SNAPSHOT" +version := "0.7.1-SNAPSHOT" spName := "potix2/spark-google-spreadsheets" @@ -16,7 +16,7 @@ spIncludeMaven := true spIgnoreProvided := true -sparkVersion := "2.3.3" +sparkVersion := "3.1.1" val testSparkVersion = settingKey[String]("The version of Spark to test against.") @@ -26,7 +26,7 @@ sparkComponents := Seq("sql") libraryDependencies ++= Seq( "org.slf4j" % "slf4j-api" % "1.7.5" % "provided", - "org.scalatest" %% "scalatest" % "2.2.1" % "test", + "org.scalatest" %% "scalatest" % "3.0.4" % "test", ("com.google.api-client" % "google-api-client" % "1.22.0"). exclude("com.google.guava", "guava-jdk5"), "com.google.oauth-client" % "google-oauth-client-jetty" % "1.22.0", diff --git a/project/plugins.sbt b/project/plugins.sbt index a2f0172..4c0600d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,10 +1,10 @@ -resolvers += Resolver.url("artifactory", url("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns) +resolvers += Resolver.url("artifactory", url("https://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns) -resolvers += "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/" +resolvers += "Typesafe Repository" at "https://repo.typesafe.com/typesafe/releases/" resolvers += "sonatype-releases" at "https://oss.sonatype.org/content/repositories/releases/" -resolvers += "Spark Package Main Repo" at "https://dl.bintray.com/spark-packages/maven" +resolvers += "Spark Package Main Repo" at "https://repos.spark-packages.org/" addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4")