Merge pull request #224 from nhaarman/update-dependencies

Update dependencies

Author: nhaarman

.gitignore

@@ -7,3 +7,4 @@ out/
 *.iml
 
 .idea/
+!/.idea/codeStyleSettings.xml

.travis.yml

@@ -9,13 +9,13 @@ matrix:
   - jdk: oraclejdk8
     env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.1.61
   - jdk: oraclejdk8
-    env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.2.0
+    env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.2.10
   - jdk: oraclejdk8
     env: TERM=dumb KOTLIN_VERSION=1.0.7
   - jdk: oraclejdk8
     env: TERM=dumb KOTLIN_VERSION=1.1.61
   - jdk: oraclejdk8
-    env: TERM=dumb KOTLIN_VERSION=1.2.0
+    env: TERM=dumb KOTLIN_VERSION=1.2.10
 
 
 env:

mockito-kotlin/build.gradle

@@ -25,11 +25,11 @@ repositories {
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    compile "org.mockito:mockito-core:2.12.0"
+    compile "org.mockito:mockito-core:2.13.0"
 
     /* Tests */
     testCompile "junit:junit:4.12"
-    testCompile "com.nhaarman:expect.kt:0.6.2"
+    testCompile "com.nhaarman:expect.kt:1.0.0"
 }
 
 dokka {