Merge pull request #204 from nhaarman/update-dependencies

Update dependencies

Author: nhaarman

mockito-kotlin/build.gradle

@@ -12,7 +12,7 @@ buildscript {
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.14"
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.15"
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3"
         classpath "com.github.dcendents:android-maven-gradle-plugin:1.5"
     }
@@ -26,7 +26,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.8.9"
+    compile "org.mockito:mockito-core:2.10.0"
 
     /* Tests */
     testCompile "junit:junit:4.12"

mockito-kotlin/src/main/kotlin/com/nhaarman/mockito_kotlin/createinstance/InstanceCreator.kt

@@ -2,18 +2,15 @@ package com.nhaarman.mockito_kotlin.createinstance
 
 import com.nhaarman.mockito_kotlin.MockitoKotlin
 import com.nhaarman.mockito_kotlin.MockitoKotlinException
-import org.mockito.Answers
-import org.mockito.internal.creation.MockSettingsImpl
+import org.mockito.Mockito
 import org.mockito.internal.creation.bytebuddy.MockAccess
 import org.mockito.internal.util.MockUtil
 import java.lang.reflect.InvocationTargetException
 import java.lang.reflect.Modifier
 import java.lang.reflect.ParameterizedType
 import java.lang.reflect.Type
 import kotlin.reflect.*
-import kotlin.reflect.jvm.isAccessible
-import kotlin.reflect.jvm.javaType
-import kotlin.reflect.jvm.jvmName
+import kotlin.reflect.jvm.*
 import java.lang.reflect.Array as JavaArray
 
 internal class InstanceCreator() : NonNullProvider {
@@ -174,9 +171,11 @@ internal class InstanceCreator() : NonNullProvider {
      */
     @Suppress("UNCHECKED_CAST")
     fun <T> Class<T>.uncheckedMock(): T {
-        val impl = MockSettingsImpl<T>().defaultAnswer(Answers.RETURNS_DEFAULTS) as MockSettingsImpl<T>
-        val creationSettings = impl.confirm(this)
-        return MockUtil.createMock(creationSettings).apply {
+        val settings = Mockito.withSettings()
+              .defaultAnswer(Mockito.RETURNS_DEFAULTS)
+              .build(this)
+
+        return MockUtil.createMock(settings).apply {
             (this as? MockAccess)?.mockitoInterceptor = null
         }
     }