Merge pull request #177 from nhaarman/update-dependencies

Update dependencies

Author: nhaarman

.travis.yml

@@ -4,14 +4,14 @@ language: java
 
 matrix:
   include:
-  - jdk: oraclejdk7
+  - jdk: oraclejdk8
     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.1
+  - jdk: oraclejdk8
+    env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.1.2-4
   - jdk: oraclejdk8
     env: TERM=dumb KOTLIN_VERSION=1.0.7
   - jdk: oraclejdk8
-    env: TERM=dumb KOTLIN_VERSION=1.1.1
+    env: TERM=dumb KOTLIN_VERSION=1.1.2-4
 
 
 env:

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.github.ben-manes.versions' version '0.14.0'
+    id 'com.github.ben-manes.versions' version '0.15.0'
 }
 
 apply from: 'gradle/scripts/tagging.gradle'

mockito-kotlin/build.gradle

@@ -8,12 +8,11 @@ buildscript {
     repositories {
         mavenCentral()
         jcenter()
-        maven { url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' }
     }
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.13"
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.14"
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3"
         classpath "com.github.dcendents:android-maven-gradle-plugin:1.5"
     }
@@ -22,13 +21,12 @@ buildscript {
 repositories {
     mavenCentral()
     jcenter()
-    maven { url 'http://dl.bintray.com/kotlin/kotlin-eap-1.1' }
 }
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    compile "org.mockito:mockito-core:2.7.21"
+    compile "org.mockito:mockito-core:2.8.9"
 
     /* Tests */
     testCompile "junit:junit:4.12"