From 0eabf942cf838024bcdeb9e27136a19118b5e309 Mon Sep 17 00:00:00 2001 From: sh0hei Date: Mon, 15 Mar 2021 12:32:50 +0900 Subject: [PATCH] Drop Scala-2.10 support --- .travis.yml | 24 ++++++++++++------------ README.md | 4 ++-- build.sbt | 8 +++----- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 928fbab..b64bf6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,17 @@ language: scala -matrix: - include: - - scala: 2.10.6 - jdk: openjdk7 - - scala: 2.10.6 - jdk: openjdk8 - - scala: 2.11.8 - jdk: openjdk7 - - scala: 2.11.8 - jdk: openjdk8 - - scala: 2.12.8 - jdk: openjdk8 +scala: + - 2.11.12 + - 2.12.8 + +jdk: + - openjdk8 script: - sbt ++$TRAVIS_SCALA_VERSION test + +cache: + directories: + - $HOME/.ivy2/cache + - $HOME/.sbt/ + - $HOME/.coursier diff --git a/README.md b/README.md index 9a1f1cb..3c40006 100644 --- a/README.md +++ b/README.md @@ -22,8 +22,8 @@ Contributions are welcome ! - S3 ([fake-s3](https://github.com/jubos/fake-s3) is OK) - `aws-java-sdk-s3`, `aws-java-sdk-sts` >= 1.10.8 - `postgresql` or `h2` JDBC driver -- Java >= 1.7 -- (If you use in Scala projects) Scala 2.10.x / 2.11.x / 2.12.x(Java 1.8) +- Java >= 1.8 +- (If you use in Scala projects) Scala 2.11.x / 2.12.x ## Installation ### Maven Java projects diff --git a/build.sbt b/build.sbt index 5a37205..7d79e52 100644 --- a/build.sbt +++ b/build.sbt @@ -1,11 +1,9 @@ import Deps._ import Helpers._ -val scala210 = "2.10.7" +scalaVersion := "2.11.12" -scalaVersion := scala210 - -crossScalaVersions := Seq(scala210, "2.11.12", "2.12.8") +crossScalaVersions := Seq("2.11.12", "2.12.8") name := "redshift-fake-driver" @@ -22,7 +20,7 @@ scalacOptions ++= Seq( ) libraryDependencies ++= (compileScope(jawn, jsqlparser, scalaCsv, commonsCompress) ++ - (if (scalaVersion.value.startsWith("2.10")) Nil else compileScope(parser)) ++ + compileScope(parser) ++ testScope(postgres, h2, s3, sts, scalatest, s3Proxy) ++ providedScope(postgres, h2, s3, sts))