Skip to content

Commit f5bc442

Browse files
authored
Merge pull request #265 from nhaarman/update-build
Update build
2 parents 9d642a2 + a29303c commit f5bc442

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ matrix:
99
- jdk: oraclejdk8
1010
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.1.61
1111
- jdk: oraclejdk8
12-
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.2.20
12+
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.2.50
1313
- jdk: oraclejdk8
1414
env: TERM=dumb KOTLIN_VERSION=1.0.7
1515
- jdk: oraclejdk8
1616
env: TERM=dumb KOTLIN_VERSION=1.1.61
1717
- jdk: oraclejdk8
18-
env: TERM=dumb KOTLIN_VERSION=1.2.20
18+
env: TERM=dumb KOTLIN_VERSION=1.2.50
1919

2020

2121
env:

mockito-kotlin/build.gradle

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

55
buildscript {
6-
ext.kotlin_version = "1.2.20"
6+
ext.kotlin_version = "1.2.50"
77

88
repositories {
99
mavenCentral()
@@ -25,17 +25,17 @@ repositories {
2525

2626
dependencies {
2727
compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
28-
compileOnly 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.19.3'
28+
compileOnly 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.23.3'
2929

30-
compile "org.mockito:mockito-core:2.13.0"
30+
compile "org.mockito:mockito-core:2.19.0"
3131

3232
testCompile 'junit:junit:4.12'
3333
testCompile 'com.nhaarman:expect.kt:1.0.0'
3434

3535
testCompile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
36-
testCompile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.19.3'
36+
testCompile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.23.3'
3737

38-
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:0.21"
38+
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:0.23.3"
3939
}
4040

4141
dokka {

tests/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildscript {
2-
ext.kotlin_version = '1.2.20'
2+
ext.kotlin_version = '1.2.50'
33
ext.kotlin_version = System.getenv("KOTLIN_VERSION") ?: '1.0.7'
44

55
repositories {
@@ -22,7 +22,7 @@ dependencies {
2222
compile files("${rootProject.projectDir}/mockito-kotlin/build/libs/mockito-kotlin-${rootProject.ext.versionName}.jar")
2323

2424
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
25-
compile "org.mockito:mockito-core:2.13.0"
25+
compile "org.mockito:mockito-core:2.19.0"
2626

2727
testCompile "junit:junit:4.12"
2828
testCompile "com.nhaarman:expect.kt:1.0.0"

0 commit comments

Comments
 (0)