Updating android to 26

build.gradle

@@ -1,13 +1,10 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.1.0-beta-38'
-    ext.kotlin_coroutines_version = '0.7-beta'
+    ext.kotlin_version = '1.1.4-3'
+    ext.kotlin_coroutines_version = '0.18'
     repositories {
         jcenter()
-        maven {
-            url "https://dl.bintray.com/kotlin/kotlin-eap-1.1"
-        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.2.2'
@@ -18,9 +15,6 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
-        maven {
-            url "https://dl.bintray.com/kotlin/kotlin-eap-1.1"
-        }
     }
 }
 

coroutines-android/build.gradle

@@ -5,19 +5,19 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
     defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 25
+        minSdkVersion 14
+        targetSdkVersion 26
         versionCode 1
         versionName project.version
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
     compileOptions {
-        targetCompatibility = '1.6'
-        sourceCompatibility = '1.6'
+        targetCompatibility = '1.7'
+        sourceCompatibility = '1.7'
     }
 
     sourceSets {
@@ -29,7 +29,7 @@ android {
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     compile "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
-    compile 'com.android.support:appcompat-v7:25.1.1'
+    compile 'com.android.support:appcompat-v7:26.0.0-alpha1'
     testCompile 'junit:junit:4.12'
 }
 

coroutines-android/src/main/kotlin/ru/gildor/coroutines/android/MainThreadDispatcher.kt

@@ -59,7 +59,7 @@ object MainThread : CoroutineDispatcher(), Delay {
 
 */
         handler.postDelayed(runnable, unit.toMillis(time))
-        continuation.onCompletion { handler.removeCallbacks(runnable) }
+        continuation.invokeOnCompletion { handler.removeCallbacks(runnable) }
     }
 }
 
@@ -73,7 +73,7 @@ fun CoroutineLifecycle.mainAsync(
         context: CoroutineContext? = null, // Using EmptyCoroutineContext by default here will safe an `if` below
         block: suspend CoroutineScope.() -> Unit
 ): Job {
-    if (isEventSupported(cancelEvent)) {
+    if (!isEventSupported(cancelEvent)) {
         throw IllegalStateException("Cancel event $cancelEvent doesn't supported by CoroutineLifecycle $this")
     }
     val job = launch(if (context == null) MainThread else context + MainThread) {
@@ -82,7 +82,7 @@ fun CoroutineLifecycle.mainAsync(
     val listener: () -> Unit = {
         job.cancel()
     }
-    job.onCompletion { removeListener(listener) }
+    job.invokeOnCompletion { removeListener(listener) }
     addListener(Destroy, listener)
     return job
 }

coroutines-retrofit/build.gradle

@@ -8,8 +8,8 @@ sourceSets {
     test.java.srcDirs += 'src/test/kotlin'
 }
 
-targetCompatibility = '1.6'
-sourceCompatibility = '1.6'
+targetCompatibility = '1.7'
+sourceCompatibility = '1.7'
 
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

coroutines-retrofit/src/main/kotlin/ru/gildor/coroutines/retrofit/CallAwait.kt

@@ -28,7 +28,6 @@ suspend fun <T> Call<T>.await(): T {
                 continuation.resumeWithException(t)
             }
         })
-
         registerOnCompletion(continuation)
     }
 }
@@ -58,7 +57,7 @@ suspend fun <T> Call<T>.awaitResult(): Result<T> {
 }
 
 private fun Call<*>.registerOnCompletion(continuation: CancellableContinuation<*>) {
-    continuation.onCompletion {
+    continuation.invokeOnCompletion {
         if (continuation.isCancelled)
             try {
                 cancel()

sample/build.gradle

@@ -3,20 +3,20 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.1"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.1"
     defaultConfig {
         applicationId "ru.gildor.coroutines.android.sample"
         minSdkVersion 15
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
     compileOptions {
-        targetCompatibility = '1.6'
-        sourceCompatibility = '1.6'
+        targetCompatibility = '1.7'
+        sourceCompatibility = '1.7'
     }
 
     sourceSets {
@@ -26,7 +26,7 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:25.1.1'
+    compile 'com.android.support:appcompat-v7:26.0.0-alpha1'
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     compile "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
     compile 'com.squareup.retrofit2:retrofit:2.1.0'