diff --git a/core/pom.xml b/core/pom.xml
index cf243ea7e..ae4cf062c 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,9 +29,35 @@
${project.basedir}/..
+ 1.6.21
+ 1.6.4
+
+ org.jetbrains.kotlin
+ kotlin-stdlib-jdk8
+ ${kotlin.version}
+
+
+
+ org.jetbrains.kotlin
+ kotlin-reflect
+ ${kotlin.version}
+
+
+
+ org.jetbrains.kotlinx
+ kotlinx-coroutines-jdk8
+ ${kotlinx.coroutines.version}
+
+
+
+ org.jetbrains.kotlinx
+ kotlinx-coroutines-reactor
+ ${kotlinx.coroutines.version}
+
+
com.squareup.okhttp3
mockwebserver
@@ -111,6 +137,37 @@
+
+ kotlin-maven-plugin
+ org.jetbrains.kotlin
+ ${kotlin.version}
+
+
+ compile
+
+ compile
+
+
+
+ ${project.basedir}/src/main/kotlin
+ ${project.basedir}/src/main/java
+
+
+
+
+ test-compile
+
+ test-compile
+
+
+
+ ${project.basedir}/src/test/kotlin
+ ${project.basedir}/src/test/java
+
+
+
+
+
diff --git a/core/src/main/java/feign/AsyncResponseHandler.java b/core/src/main/java/feign/AsyncResponseHandler.java
index b73439d36..f927edc02 100644
--- a/core/src/main/java/feign/AsyncResponseHandler.java
+++ b/core/src/main/java/feign/AsyncResponseHandler.java
@@ -18,6 +18,8 @@
import feign.Logger.Level;
import feign.codec.Decoder;
import feign.codec.ErrorDecoder;
+import kotlin.Unit;
+
import java.io.IOException;
import java.lang.reflect.Type;
import java.util.concurrent.CompletableFuture;
@@ -54,7 +56,7 @@ class AsyncResponseHandler {
}
boolean isVoidType(Type returnType) {
- return Void.class == returnType || void.class == returnType;
+ return Void.class == returnType || void.class == returnType || Unit.class == returnType;
}
void handleResponse(CompletableFuture