Update to Kotlin 1.3.11 and coroutines 1.0.1

build.gradle

@@ -1,10 +1,9 @@
 buildscript {
   repositories {
     mavenCentral()
-    maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
   }
   dependencies {
-    classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-rc-57'
+    classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0'
   }
 }
 
@@ -17,14 +16,12 @@ sourceCompatibility = JavaVersion.VERSION_1_6
 
 repositories {
   mavenCentral()
-  maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
-  maven { url 'https://kotlin.bintray.com/kotlinx' }
 }
 
 dependencies {
   api 'com.squareup.retrofit2:retrofit:2.4.0'
-  api 'org.jetbrains.kotlin:kotlin-stdlib:1.3.0-rc-57'
-  api 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.26.1-eap13'
+  api 'org.jetbrains.kotlin:kotlin-stdlib:1.3.0'
+  api 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.0'
 
   testImplementation 'junit:junit:4.12'
   testImplementation 'com.squareup.okhttp3:mockwebserver:3.11.0'

gradle.properties

@@ -1,5 +1,5 @@
 GROUP=com.jakewharton.retrofit
-VERSION_NAME=0.9.3-SNAPSHOT
+VERSION_NAME=1.0.0-SNAPSHOT
 
 POM_NAME=Retrofit 2 Kotlin Coroutine Adapter
 POM_DESCRIPTION=A CallAdapter.Factory for Kotlin coroutine's Deferred.

src/main/java/com/jakewharton/retrofit2/adapter/kotlin/coroutines/CoroutineCallAdapterFactory.kt

@@ -15,6 +15,7 @@
  */
 package com.jakewharton.retrofit2.adapter.kotlin.coroutines
 
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.Deferred
 import retrofit2.Call
@@ -87,7 +88,12 @@ class CoroutineCallAdapterFactory private constructor() : CallAdapter.Factory()
       val deferred = CompletableDeferred<T>()
 
       deferred.invokeOnCompletion {
-        if (deferred.isCancelled) {
+        /**
+         * The [call] should not be marked as cancelled when it completes exceptionally.
+         * If the cause of cancellation is [CancellationException], then the [CompletableDeferred] is
+         * considered to be _cancelled normally_.
+         */
+        if (deferred.isCancelled && it is CancellationException) {
           call.cancel()
         }
       }
@@ -120,7 +126,12 @@ class CoroutineCallAdapterFactory private constructor() : CallAdapter.Factory()
       val deferred = CompletableDeferred<Response<T>>()
 
       deferred.invokeOnCompletion {
-        if (deferred.isCancelled) {
+        /**
+         * The [call] should not be marked as cancelled when it completes exceptionally.
+         * If the cause of cancellation is [CancellationException], then the [CompletableDeferred] is
+         * considered to be _cancelled normally_.
+         */
+        if (deferred.isCancelled && it is CancellationException) {
           call.cancel()
         }
       }

src/test/java/com/jakewharton/retrofit2/adapter/kotlin/coroutines/CancelTest.kt

@@ -36,7 +36,7 @@ class CancelTest {
     val deferred = adapter.adapt(call)
     call.completeWithException(IOException())
     assertFalse(call.isCanceled)
-    assertTrue(deferred.isCompletedExceptionally)
+    assertTrue(deferred.isCancelled && deferred.isCompleted)
   }
 
   @Test fun cancelOnCancel() {