Merge branch '2.x' into checketts-2.x

Author: nhaarman

.gitignore

@@ -8,6 +8,7 @@ out/
 
 .idea/caches/*
 .idea/compiler.xml
+.idea/encodings.xml
 .idea/gradle.xml
 .idea/kotlinc.xml
 .idea/libraries/*

.travis.yml

@@ -11,15 +11,15 @@ matrix:
   - jdk: oraclejdk8
     env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.2.50
   - jdk: oraclejdk8
-    env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.3.0-rc-116
+    env: TERM=dumb MOCK_MAKER=mock-maker-inline KOTLIN_VERSION=1.3.0
   - 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.50
   - jdk: oraclejdk8
-    env: TERM=dumb KOTLIN_VERSION=1.3.0-rc-116
+    env: TERM=dumb KOTLIN_VERSION=1.3.0
 
 
 env:

build.gradle

@@ -5,12 +5,12 @@ buildscript {
         }
     }
     dependencies {
-        classpath "io.spring.gradle:spring-bintray-plugin:0.9.0"
+        classpath "io.spring.gradle:spring-bintray-plugin:0.11.1"
     }
 }
 
 plugins {
-    id 'com.github.ben-manes.versions' version '0.17.0'
+    id 'com.github.ben-manes.versions' version '0.20.0'
 }
 
 apply from: 'gradle/scripts/tagging.gradle'

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Sun Dec 03 21:34:47 CET 2017
+#Mon Oct 29 21:53:52 CET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }

gradlew

@@ -3,41 +3,39 @@ apply from: '../publishing.gradle'
 apply plugin: 'org.jetbrains.dokka'
 
 buildscript {
-    ext.kotlin_version = "1.3.0-rc-146"
+    ext.kotlin_version = "1.3.0"
 
     repositories {
         mavenCentral()
         jcenter()
-        maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
     }
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.15"
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0"
-        classpath "com.github.dcendents:android-maven-gradle-plugin:2.0"
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.17"
+        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4"
+        classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
     }
 }
 
 repositories {
     mavenCentral()
     jcenter()
-    maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
 }
 
 dependencies {
     compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    compileOnly 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.30.0-eap13'
+    compileOnly 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.0'
 
     compile "org.mockito:mockito-core:2.23.0"
 
     testCompile 'junit:junit:4.12'
     testCompile 'com.nhaarman:expect.kt:1.0.0'
 
     testCompile  "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    testCompile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.30.0-eap13'
+    testCompile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.0'
 
-    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:0.30.0-eap13"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.0.0"
 }
 
 dokka {

mockito-kotlin/build.gradle

@@ -27,6 +27,7 @@ package com.nhaarman.mockitokotlin2
 
 import org.mockito.BDDMockito
 import org.mockito.BDDMockito.BDDMyOngoingStubbing
+import org.mockito.stubbing.Answer
 
 /**
  * Alias for [BDDMockito.given].
@@ -49,6 +50,13 @@ fun <T> then(mock: T): BDDMockito.Then<T> {
     return BDDMockito.then(mock)
 }
 
+/**
+ * Alias for [BDDMyOngoingStubbing.will]
+ * */
+infix fun <T> BDDMyOngoingStubbing<T>.will(value: Answer<T>): BDDMockito.BDDMyOngoingStubbing<T> {
+    return will(value)
+}
+
 /**
  * Alias for [BBDMyOngoingStubbing.willAnswer], accepting a lambda.
  */

mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/BDDMockito.kt

@@ -133,7 +133,7 @@ fun <T : Any> notNull(): T? {
  * Object argument that is reflection-equal to the given value with support for excluding
  * selected fields from a class.
  */
-fun <T> refEq(value: T, vararg excludeFields: String): T? {
-    return Mockito.refEq(value, *excludeFields)
+inline fun <reified T : Any> refEq(value: T, vararg excludeFields: String): T {
+    return Mockito.refEq<T>(value, *excludeFields) ?: createInstance()
 }
 

mockito-kotlin/src/main/kotlin/com/nhaarman/mockitokotlin2/Matchers.kt

@@ -53,6 +53,16 @@ fun <T> verifyBlocking(mock: T, f: suspend T.() -> Unit) {
     runBlocking { m.f() }
 }
 
+/**
+ * Verifies certain behavior happened at least once / exact number of times / never.
+ *
+ * Warning: Only one method call can be verified in the function.
+ * Subsequent method calls are ignored!
+ */
+fun <T> verifyBlocking(mock: T, mode: VerificationMode, f: suspend T.() -> Unit) {
+    val m = Mockito.verify(mock, mode)
+    runBlocking { m.f() }
+}
 /**
  * Verifies certain behavior happened at least once / exact number of times / never.
  *