Skip to content

Commit 87e0da2

Browse files
authored
Merge pull request #153 from nhaarman/update-dependencies
Update dependencies
2 parents eb0b113 + 5723b53 commit 87e0da2

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ matrix:
77
- jdk: oraclejdk7
88
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.0.6
99
- jdk: oraclejdk7
10-
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.1.0-beta-18
10+
env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.1.0-beta-38
1111
- jdk: oraclejdk8
1212
env: TERM=dumb KOTLIN_VERSION=1.0.6
1313
- jdk: oraclejdk8
14-
env: TERM=dumb KOTLIN_VERSION=1.1.0-beta-18
14+
env: TERM=dumb KOTLIN_VERSION=1.1.0-beta-38
1515

1616

1717
env:

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id 'com.github.ben-manes.versions' version '0.13.0'
2+
id 'com.github.ben-manes.versions' version '0.14.0'
33
}
44

55
apply from: 'gradle/scripts/tagging.gradle'

mockito-kotlin/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ repositories {
2828
dependencies {
2929
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
3030
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
31-
compile "org.mockito:mockito-core:2.6.5"
31+
compile "org.mockito:mockito-core:2.7.5"
3232

3333
/* Tests */
3434
testCompile "junit:junit:4.12"

0 commit comments

Comments
 (0)