Migrate to Kotlin 1.3 and coroutines 1.0.0

4u7 · 4u7 · commit 3dd1a62e7698 · 2018-11-07T13:39:12.000+03:00
diff --git a/anko/library/generated/appcompat-v7-coroutines/src/main/java/ListenersWithCoroutines.kt b/anko/library/generated/appcompat-v7-coroutines/src/main/java/ListenersWithCoroutines.kt
@@ -2,10 +2,10 @@
 package org.jetbrains.anko.appcompat.v7.coroutines
 
 
-import kotlin.coroutines.experimental.CoroutineContext
-import kotlinx.coroutines.experimental.android.UI
-import kotlinx.coroutines.experimental.CoroutineScope
-import kotlinx.coroutines.experimental.launch
+import kotlin.coroutines.CoroutineContext
+import kotlinx.coroutines.android.UI
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 
 fun android.support.v7.widget.ActionMenuView.onMenuItemClick(
         context: CoroutineContext = UI,
diff --git a/anko/library/generated/coroutines/src/main/java/bg.kt b/anko/library/generated/coroutines/src/main/java/bg.kt
@@ -19,15 +19,15 @@
 
 package org.jetbrains.anko.coroutines.experimental
 
-import kotlinx.coroutines.experimental.Deferred
-import kotlinx.coroutines.experimental.async
-import kotlinx.coroutines.experimental.newFixedThreadPoolContext
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.async
+import kotlinx.coroutines.newFixedThreadPoolContext
 
 @PublishedApi
 @Deprecated(message = "Use the default pool")
 internal var POOL = newFixedThreadPoolContext(2 * Runtime.getRuntime().availableProcessors(), "bg")
 
-@Deprecated(message = "Use the default pool", replaceWith = ReplaceWith("async(block)", "kotlinx.coroutines.experimental.async"))
+@Deprecated(message = "Use the default pool", replaceWith = ReplaceWith("async(block)", "kotlinx.coroutines.async"))
 inline fun <T> bg(crossinline block: () -> T): Deferred<T> = async(POOL) {
     block()
 }
diff --git a/anko/library/generated/coroutines/src/main/java/weakReferenceSupport.kt b/anko/library/generated/coroutines/src/main/java/weakReferenceSupport.kt
@@ -18,13 +18,15 @@ package org.jetbrains.anko.coroutines.experimental
 
 import java.lang.ref.WeakReference
 import java.util.concurrent.CancellationException
-import kotlin.coroutines.experimental.intrinsics.suspendCoroutineOrReturn
+import kotlin.coroutines.intrinsics.intercepted
+import kotlin.coroutines.intrinsics.suspendCoroutineUninterceptedOrReturn
 
 class Ref<out T : Any> internal constructor(obj: T) {
     private val weakRef = WeakReference(obj)
 
     suspend operator fun invoke(): T {
-        return suspendCoroutineOrReturn {
+        return suspendCoroutineUninterceptedOrReturn {
+            it.intercepted()
             weakRef.get() ?: throw CancellationException()
         }
     }
diff --git a/anko/library/generated/design-coroutines/src/main/java/ListenersWithCoroutines.kt b/anko/library/generated/design-coroutines/src/main/java/ListenersWithCoroutines.kt
@@ -2,10 +2,10 @@
 package org.jetbrains.anko.design.coroutines
 
 
-import kotlin.coroutines.experimental.CoroutineContext
-import kotlinx.coroutines.experimental.android.UI
-import kotlinx.coroutines.experimental.CoroutineScope
-import kotlinx.coroutines.experimental.launch
+import kotlin.coroutines.CoroutineContext
+import kotlinx.coroutines.android.UI
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 
 fun android.support.design.widget.AppBarLayout.onOffsetChanged(
         context: CoroutineContext = UI,
diff --git a/anko/library/generated/recyclerview-v7-coroutines/src/main/java/ListenersWithCoroutines.kt b/anko/library/generated/recyclerview-v7-coroutines/src/main/java/ListenersWithCoroutines.kt
@@ -2,10 +2,10 @@
 package org.jetbrains.anko.recyclerview.v7.coroutines
 
 
-import kotlin.coroutines.experimental.CoroutineContext
-import kotlinx.coroutines.experimental.android.UI
-import kotlinx.coroutines.experimental.CoroutineScope
-import kotlinx.coroutines.experimental.launch
+import kotlin.coroutines.CoroutineContext
+import kotlinx.coroutines.android.UI
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 
 fun android.support.v7.widget.RecyclerView.onChildAttachStateChangeListener(
         context: CoroutineContext = UI,
diff --git a/anko/library/generated/sdk15-coroutines/src/main/java/ListenersWithCoroutines.kt b/anko/library/generated/sdk15-coroutines/src/main/java/ListenersWithCoroutines.kt
@@ -2,10 +2,10 @@
 package org.jetbrains.anko.sdk15.coroutines
 
 
-import kotlin.coroutines.experimental.CoroutineContext
-import kotlinx.coroutines.experimental.android.UI
-import kotlinx.coroutines.experimental.CoroutineScope
-import kotlinx.coroutines.experimental.launch
+import kotlin.coroutines.CoroutineContext
+import kotlinx.coroutines.android.UI
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 
 fun android.view.View.onLayoutChange(
         context: CoroutineContext = UI,
diff --git a/anko/library/generated/sdk19-coroutines/src/main/java/ListenersWithCoroutines.kt b/anko/library/generated/sdk19-coroutines/src/main/java/ListenersWithCoroutines.kt
@@ -2,10 +2,10 @@
 package org.jetbrains.anko.sdk19.coroutines
 
 
-import kotlin.coroutines.experimental.CoroutineContext
-import kotlinx.coroutines.experimental.android.UI
-import kotlinx.coroutines.experimental.CoroutineScope
-import kotlinx.coroutines.experimental.launch
+import kotlin.coroutines.CoroutineContext
+import kotlinx.coroutines.android.UI
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 
 fun android.view.View.onLayoutChange(
         context: CoroutineContext = UI,
diff --git a/anko/library/generated/sdk21-coroutines/src/main/java/ListenersWithCoroutines.kt b/anko/library/generated/sdk21-coroutines/src/main/java/ListenersWithCoroutines.kt
@@ -2,10 +2,10 @@
 package org.jetbrains.anko.sdk21.coroutines
 
 
-import kotlin.coroutines.experimental.CoroutineContext
-import kotlinx.coroutines.experimental.android.UI
-import kotlinx.coroutines.experimental.CoroutineScope
-import kotlinx.coroutines.experimental.launch
+import kotlin.coroutines.CoroutineContext
+import kotlinx.coroutines.android.UI
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 import android.view.WindowInsets
 
 fun android.view.View.onLayoutChange(
diff --git a/anko/library/generated/sdk23-coroutines/src/main/java/ListenersWithCoroutines.kt b/anko/library/generated/sdk23-coroutines/src/main/java/ListenersWithCoroutines.kt
@@ -2,10 +2,10 @@
 package org.jetbrains.anko.sdk23.coroutines
 
 
-import kotlin.coroutines.experimental.CoroutineContext
-import kotlinx.coroutines.experimental.android.UI
-import kotlinx.coroutines.experimental.CoroutineScope
-import kotlinx.coroutines.experimental.launch
+import kotlin.coroutines.CoroutineContext
+import kotlinx.coroutines.android.UI
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 import android.view.WindowInsets
 
 fun android.view.View.onLayoutChange(
diff --git a/anko/library/generated/sdk25-coroutines/src/main/java/ListenersWithCoroutines.kt b/anko/library/generated/sdk25-coroutines/src/main/java/ListenersWithCoroutines.kt
@@ -2,10 +2,10 @@
 package org.jetbrains.anko.sdk25.coroutines
 
 
-import kotlin.coroutines.experimental.CoroutineContext
-import kotlinx.coroutines.experimental.android.UI
-import kotlinx.coroutines.experimental.CoroutineScope
-import kotlinx.coroutines.experimental.launch
+import kotlin.coroutines.CoroutineContext
+import kotlinx.coroutines.android.UI
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 import android.view.WindowInsets
 
 fun android.view.View.onLayoutChange(
diff --git a/anko/library/generated/sdk27-coroutines/src/main/java/ListenersWithCoroutines.kt b/anko/library/generated/sdk27-coroutines/src/main/java/ListenersWithCoroutines.kt
@@ -2,10 +2,10 @@
 package org.jetbrains.anko.sdk27.coroutines
 
 
-import kotlin.coroutines.experimental.CoroutineContext
-import kotlinx.coroutines.experimental.android.UI
-import kotlinx.coroutines.experimental.CoroutineScope
-import kotlinx.coroutines.experimental.launch
+import kotlin.coroutines.CoroutineContext
+import kotlinx.coroutines.android.UI
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 import android.view.WindowInsets
 
 fun android.view.View.onLayoutChange(
diff --git a/anko/props/templates/complex_listener_coroutines.twig b/anko/props/templates/complex_listener_coroutines.twig
@@ -1,33 +1,33 @@
 fun {{ setter.receiver }}.{{ setter.methodName }}Listener(
-        context: {{ imported("kotlin.coroutines.experimental.CoroutineContext") }} = {{ imported("kotlinx.coroutines.experimental.android.UI") }},
+        context: {{ imported("kotlin.coroutines.CoroutineContext") }} = {{ imported("kotlinx.coroutines.android.UI") }},
         init: {{ setter.listener }}.() -> Unit
 ) {
     val listener = {{ setter.listener }}(context)
     listener.init()
     {{ setter.setter }}(listener)
 }
 
-class {{ helperClassName }}(private val context: {{ imported("kotlin.coroutines.experimental.CoroutineContext") }}) : {{ listenerClassName }}{{ superConstructorCall }} {
+class {{ helperClassName }}(private val context: {{ imported("kotlin.coroutines.CoroutineContext") }}) : {{ listenerClassName }}{{ superConstructorCall }} {
 {% for method in methods %}
-    private var _{{ method.varName }}: (suspend {{ imported("kotlinx.coroutines.experimental.CoroutineScope") }}.({{ method.argTypes }}) -> {{ imported(method.returnType) }})? = null
+    private var _{{ method.varName }}: (suspend {{ imported("kotlinx.coroutines.CoroutineScope") }}.({{ method.argTypes }}) -> {{ imported(method.returnType) }})? = null
     {% if (method.returnType != "Unit") %}private var _{{ method.varName }}_returnValue: {{ method.possiblyNullableReturnType }}{% if (method.returnDefaultValue != "") %} = {{ method.returnDefaultValue }}{% endif %}{% endif %}
 
     override fun {{ method.methodName }}({{ method.args }}){% if (method.returnType != "Unit") %} : {{ method.returnType }}{% endif %} {
         {% if (method.returnType != "Unit") %}val returnValue = _{{ method.varName }}_returnValue
         {% endif %}val handler = _{{ method.varName }} ?: return{% if (method.returnType != "Unit") %} returnValue{% endif %}
         {% if (method.hasArgs == true) -%}
-        {{ imported("kotlinx.coroutines.experimental.launch") }}(context) {
+        {{ imported("kotlinx.coroutines.launch") }}(context) {
             handler({{ method.argNames }})
         }
         {%- else -%}
-        {{ imported("kotlinx.coroutines.experimental.launch") }}(context, block = handler)
+        {{ imported("kotlinx.coroutines.launch") }}(context, block = handler)
         {%- endif %}{% if (method.returnType != "Unit") %}
         return returnValue{% endif %}
     }
 
     fun {{ method.methodName }}(
             {% if (method.returnType != "Unit") %}returnValue: {{ method.returnType }}{% if (method.returnDefaultValue != "") %} = {{ method.returnDefaultValue }}{% endif %},
-            {% endif %}listener: suspend {{ imported("kotlinx.coroutines.experimental.CoroutineScope") }}.({{ method.argTypes }}) -> {{ imported(method.returnType) }}
+            {% endif %}listener: suspend {{ imported("kotlinx.coroutines.CoroutineScope") }}.({{ method.argTypes }}) -> {{ imported(method.returnType) }}
     ) {
         _{{ method.varName }} = listener{% if (method.returnType != "Unit") %}
         _{{ method.varName }}_returnValue = returnValue{% endif %}
diff --git a/anko/props/templates/simple_listener_coroutines.twig b/anko/props/templates/simple_listener_coroutines.twig
@@ -1,15 +1,15 @@
 fun {{ receiver }}.{{ name }}(
-        context: {{ imported("kotlin.coroutines.experimental.CoroutineContext") }} = {{ imported("kotlinx.coroutines.experimental.android.UI") }},
+        context: {{ imported("kotlin.coroutines.CoroutineContext") }} = {{ imported("kotlinx.coroutines.android.UI") }},
         {% if (returnType != "Unit") %}returnValue: {{ imported(returnType) }}{% if (returnDefaultValue != "") %} = {{ returnDefaultValue }}{% endif %},
-        {% endif %}handler: suspend {{ imported("kotlinx.coroutines.experimental.CoroutineScope") }}.({{ args }}) -> Unit
+        {% endif %}handler: suspend {{ imported("kotlinx.coroutines.CoroutineScope") }}.({{ args }}) -> Unit
 ) {
     {{setter}} { {{ argNames }} ->
         {% if (hasArgs == true) -%}
-        {{ imported("kotlinx.coroutines.experimental.launch") }}(context) {
+        {{ imported("kotlinx.coroutines.launch") }}(context) {
             handler({{ argNames }})
         }
         {%- else -%}
-        {{ imported("kotlinx.coroutines.experimental.launch") }}(context, block = handler)
+        {{ imported("kotlinx.coroutines.launch") }}(context, block = handler)
         {%- endif %}{% if (returnType != "Unit") %}
         returnValue{% endif %}
     }
diff --git a/build.gradle b/build.gradle
@@ -2,9 +2,9 @@ import java.util.zip.ZipEntry
 import java.util.zip.ZipOutputStream
 
 buildscript {
-    ext.kotlin_version = '1.2.71'
+    ext.kotlin_version = '1.3.0'
     ext.kotlinx_dom_version = '0.0.10'
-    ext.kotlinx_coroutines_version = '0.23.4'
+    ext.kotlinx_coroutines_version = '1.0.0'
 
     ext.ANKO_VERSION = '0.10.7'
     ext.ANKO_VERSION_CODE = 106
