Skip to content

Commit 1e51d75

Browse files
authored
Merge pull request lightbend-labs#85 from jakubjanecek/UpdateDependencies
Update dependencies
2 parents 1e289c6 + 3484dcf commit 1e51d75

File tree

3 files changed

+10
-25
lines changed

3 files changed

+10
-25
lines changed

.travis.yml

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@ sudo: required
22
dist: trusty
33
language: scala
44
scala:
5-
- 2.11.8
6-
- 2.12.0-M5
7-
- 2.12.0-RC1
8-
- 2.12.0-RC2
9-
- 2.12.0
5+
- 2.11.11
6+
- 2.12.2
107
env:
118
- JDK=oraclejdk8
129
- JDK=openjdk8
@@ -22,19 +19,7 @@ before_script:
2219
matrix:
2320
# scala 2.12 requires java 8
2421
exclude:
25-
- scala: 2.12.0-M5
22+
- scala: 2.12.2
2623
env: JDK=oraclejdk7
27-
- scala: 2.12.0-M5
28-
env: JDK=openjdk7
29-
- scala: 2.12.0-RC1
30-
env: JDK=oraclejdk7
31-
- scala: 2.12.0-RC1
32-
env: JDK=openjdk7
33-
- scala: 2.12.0-RC2
34-
env: JDK=oraclejdk7
35-
- scala: 2.12.0-RC2
36-
env: JDK=openjdk7
37-
- scala: 2.12.0
38-
env: JDK=oraclejdk7
39-
- scala: 2.12.0
24+
- scala: 2.12.2
4025
env: JDK=openjdk7

project/Dependencies.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import sbt._
22

33
object Version {
4-
val logback = "1.1.7"
4+
val logback = "1.2.3"
55
val mockito = "1.10.19"
6-
val scala = "2.11.8"
7-
val crossScala = List(scala, "2.12.0-M5", "2.12.0-RC1", "2.12.0-RC2", "2.12.0")
8-
val scalaTest = "3.0.0"
9-
val slf4j = "1.7.21"
6+
val scala = "2.11.11"
7+
val crossScala = List(scala, "2.12.2")
8+
val scalaTest = "3.0.3"
9+
val slf4j = "1.7.25"
1010
}
1111

1212
object Library {

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.13
1+
sbt.version=0.13.15

0 commit comments

Comments
 (0)