Skip to content

Commit

Permalink
Drop Scala-2.10 support
Browse files Browse the repository at this point in the history
  • Loading branch information
sh0hei committed Mar 15, 2021
1 parent 96dfe08 commit 0eabf94
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 19 deletions.
24 changes: 12 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -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"

Expand All @@ -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))

Expand Down

0 comments on commit 0eabf94

Please sign in to comment.