Skip to content

Commit 6420002

Browse files
committed
bump Scala versions and modernize Travis-CI config
1 parent 00f22e4 commit 6420002

File tree

2 files changed

+10
-17
lines changed

2 files changed

+10
-17
lines changed

.travis.yml

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,16 @@
1-
dist: bionic
2-
1+
version: ~> 1.0 # needed for imports
2+
import: scala/scala-dev:travis/default.yml
33
language: scala
4+
45
scala:
5-
- 2.12.12
6+
- 2.12.13
67
- 2.11.12
7-
- 2.13.3
8+
- 2.13.4
89

9-
jdk:
10-
- oraclejdk11
11-
- openjdk8
12-
- openjdk11
10+
env:
11+
- ADOPTOPENJDK=8
12+
- ADOPTOPENJDK=11
1313

1414
script:
1515
- sbt "++ ${TRAVIS_SCALA_VERSION}!" test
1616
- git diff --exit-code # check scalariform
17-
18-
cache:
19-
directories:
20-
- $HOME/.m2
21-
- $HOME/.ivy2/cache
22-
- $HOME/.sbt/boot/
23-

project/Dependencies.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import sbt._
33
object Version {
44
val logback = "1.2.3"
55
val mockito = "1.16.23"
6-
val scala = "2.13.1"
7-
val crossScala = List(scala, "2.11.12", "2.12.12")
6+
val scala = "2.13.4"
7+
val crossScala = List(scala, "2.11.12", "2.12.13")
88
val scalaTest = "3.2.3"
99
val slf4j = "1.7.30"
1010
}

0 commit comments

Comments
 (0)