Skip to content

Commit c8066a7

Browse files
authored
Merge pull request #99 from sullis/scala-version-2.12.4
Scala 2.12.2 -> 2.12.4
2 parents b646f36 + 4bdbd5d commit c8066a7

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ dist: trusty
33
language: scala
44
scala:
55
- 2.11.11
6-
- 2.12.2
6+
- 2.12.4
77
- 2.13.0-M2
88
env:
99
- JDK=oraclejdk8
@@ -20,9 +20,9 @@ before_script:
2020
matrix:
2121
# scala 2.12 and 2.13 require java 8
2222
exclude:
23-
- scala: 2.12.2
23+
- scala: 2.12.4
2424
env: JDK=oraclejdk7
25-
- scala: 2.12.2
25+
- scala: 2.12.4
2626
env: JDK=openjdk7
2727
- scala: 2.13.0-M2
2828
env: JDK=oraclejdk7

project/Dependencies.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ object Version {
44
val logback = "1.2.3"
55
val mockito = "1.10.19"
66
val scala = "2.11.11"
7-
val crossScala = List(scala, "2.12.2", "2.13.0-M2")
7+
val crossScala = List(scala, "2.12.4", "2.13.0-M2")
88
val scalaTest = "3.0.4"
99
val slf4j = "1.7.25"
1010
}

0 commit comments

Comments
 (0)