Merge pull request #262 from bohsen/master

Updated Mockito to version 2.18.3. Fixes #256

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.17"
         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.18.3"
 
     /* Tests */
     testCompile "junit:junit:4.12"

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

@@ -175,7 +175,7 @@ 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)
+        val creationSettings = impl.setTypeToMock(this)
         return MockUtil.createMock(creationSettings).apply {
             (this as? MockAccess)?.mockitoInterceptor = null
         }