Skip to content

Commit 66d8249

Browse files
committed
Also test with Kotlin 1.1
1 parent cdc34a0 commit 66d8249

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

.travis.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@ sudo: false
22

33
language: java
44

5-
jdk:
6-
- oraclejdk7
7-
85
matrix:
96
include:
107
- jdk: oraclejdk7
11-
env: TERM=dumb MOCK_MAKER=mock-maker-inline
8+
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.0.5
9+
- jdk: oraclejdk7
10+
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.1-M02
11+
- jdk: oraclejdk8
12+
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.0.5
13+
- jdk: oraclejdk8
14+
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.1-M02
15+
1216

1317
env:
1418
matrix:

mockito-kotlin/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ apply from: './publishing.gradle'
33
apply plugin: 'org.jetbrains.dokka'
44

55
buildscript {
6-
ext.kotlin_version = '1.0.5'
6+
ext.kotlin_version = System.getenv("KOTLIN_VERSION") ?: '1.0.5'
77

88
repositories {
99
mavenCentral()
1010
jcenter()
11+
maven { url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' }
1112
}
1213

1314
dependencies {
@@ -19,6 +20,7 @@ buildscript {
1920
repositories {
2021
mavenCentral()
2122
jcenter()
23+
maven { url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' }
2224
}
2325

2426
dependencies {

0 commit comments

Comments
 (0)