Merge pull request #159 from nhaarman/update-dependencies

Update dependencies
mockito · Apr 1, 2017 · 8a8a727 · 8a8a727
2 parents 0b22ec3 + a9a61af
commit 8a8a727
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,13 +5,13 @@ language: java
 matrix:
   include:
   - jdk: oraclejdk7
-    env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.0.6
+    env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.0.7
   - jdk: oraclejdk7
-    env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.1.0-beta-38
+    env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.1.1
   - jdk: oraclejdk8
-    env: TERM=dumb KOTLIN_VERSION=1.0.6
+    env: TERM=dumb KOTLIN_VERSION=1.0.7
   - jdk: oraclejdk8
-    env: TERM=dumb KOTLIN_VERSION=1.1.0-beta-38
+    env: TERM=dumb KOTLIN_VERSION=1.1.1
 
 
 env:

diff --git a/mockito-kotlin/build.gradle b/mockito-kotlin/build.gradle
@@ -3,7 +3,7 @@ apply from: './publishing.gradle'
 apply plugin: 'org.jetbrains.dokka'
 
 buildscript {
-    ext.kotlin_version = System.getenv("KOTLIN_VERSION") ?: '1.0.6'
+    ext.kotlin_version = System.getenv("KOTLIN_VERSION") ?: '1.0.7'
 
     repositories {
         mavenCentral()
@@ -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.7.5"
+    compile "org.mockito:mockito-core:2.7.21"
 
     /* Tests */
     testCompile "junit:junit:4.12"