Merge pull request #153 from nhaarman/update-dependencies

Update dependencies
mockito · Feb 11, 2017 · 87e0da2 · 87e0da2
2 parents eb0b113 + 5723b53
commit 87e0da2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,11 +7,11 @@ matrix:
   - jdk: oraclejdk7
     env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.0.6
   - jdk: oraclejdk7
-    env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.1.0-beta-18
+    env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.1.0-beta-38
   - jdk: oraclejdk8
     env: TERM=dumb KOTLIN_VERSION=1.0.6
   - jdk: oraclejdk8
-    env: TERM=dumb KOTLIN_VERSION=1.1.0-beta-18
+    env: TERM=dumb KOTLIN_VERSION=1.1.0-beta-38
 
 
 env:

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.ben-manes.versions' version '0.13.0'
+    id 'com.github.ben-manes.versions' version '0.14.0'
 }
 
 apply from: 'gradle/scripts/tagging.gradle'

diff --git a/mockito-kotlin/build.gradle b/mockito-kotlin/build.gradle
@@ -28,7 +28,7 @@ repositories {
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    compile "org.mockito:mockito-core:2.6.5"
+    compile "org.mockito:mockito-core:2.7.5"
 
     /* Tests */
     testCompile "junit:junit:4.12"