aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiek Haarman <haarman.niek@gmail.com>2019-09-04 11:32:26 +0200
committerGitHub <noreply@github.com>2019-09-04 11:32:26 +0200
commit19470e0420673dd65027739defb32e7c8524118f (patch)
treef851875eb73d584a4247558616e5c6c355fedf88
parent97d8c90e935bfb4ed11dffc71cb63cf9444be6ba (diff)
parentd87150dec5298972a25b84cd05cb5a918bc71773 (diff)
downloadmockito-kotlin-19470e0420673dd65027739defb32e7c8524118f.tar.gz
Merge branch '2.x' into fix-matchers-test
-rw-r--r--.travis.yml16
1 files changed, 8 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 192cdef..9b4a49e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,21 +4,21 @@ language: java
matrix:
include:
- - jdk: oraclejdk8
+ - jdk: openjdk8
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.0.7
- - jdk: oraclejdk8
+ - jdk: openjdk8
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.1.61
- - jdk: oraclejdk8
+ - jdk: openjdk8
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.2.50
- - jdk: oraclejdk8
+ - jdk: openjdk8
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.3.40
- - jdk: oraclejdk8
+ - jdk: openjdk8
env: TERM=dumb KOTLIN_VERSION=1.0.7
- - jdk: oraclejdk8
+ - jdk: openjdk8
env: TERM=dumb KOTLIN_VERSION=1.1.61
- - jdk: oraclejdk8
+ - jdk: openjdk8
env: TERM=dumb KOTLIN_VERSION=1.2.50
- - jdk: oraclejdk8
+ - jdk: openjdk8
env: TERM=dumb KOTLIN_VERSION=1.3.40