Skip to content

Commit cf5e0e5

Browse files
committed
Update Kotlin to 1.2.60, K/N to 0.81, atomicfu to 0.11.1
1 parent e90cdb0 commit cf5e0e5

File tree

8 files changed

+65
-8
lines changed

8 files changed

+65
-8
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[![Download](https://api.bintray.com/packages/kotlin/kotlinx/kotlinx.coroutines/images/download.svg?version=0.24.0) ](https://bintray.com/kotlin/kotlinx/kotlinx.coroutines/0.24.0)
66

77
Library support for Kotlin coroutines with [multiplatform](#multiplatform) support.
8-
This is a companion version for Kotlin 1.2.51 release.
8+
This is a companion version for Kotlin 1.2.60 release.
99

1010
```kotlin
1111
launch {
@@ -71,7 +71,7 @@ And make sure that you use the latest Kotlin version:
7171

7272
```xml
7373
<properties>
74-
<kotlin.version>1.2.51</kotlin.version>
74+
<kotlin.version>1.2.60</kotlin.version>
7575
</properties>
7676
```
7777

@@ -87,7 +87,7 @@ And make sure that you use the latest Kotlin version:
8787

8888
```groovy
8989
buildscript {
90-
ext.kotlin_version = '1.2.51'
90+
ext.kotlin_version = '1.2.60'
9191
}
9292
```
9393

binary-compatibility-validator/reference-public-api/kotlinx-coroutines-core.txt

Lines changed: 53 additions & 0 deletions
Large diffs are not rendered by default.

binary-compatibility-validator/reference-public-api/kotlinx-coroutines-reactive.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ public final class kotlinx/coroutines/experimental/reactive/AwaitKt {
88
}
99

1010
public final class kotlinx/coroutines/experimental/reactive/ChannelKt {
11+
public static final fun consumeEach (Lorg/reactivestreams/Publisher;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
1112
public static final synthetic fun consumeEach (Lorg/reactivestreams/Publisher;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
1213
public static final fun iterator (Lorg/reactivestreams/Publisher;)Lkotlinx/coroutines/experimental/channels/ChannelIterator;
1314
public static final fun open (Lorg/reactivestreams/Publisher;)Lkotlinx/coroutines/experimental/channels/SubscriptionReceiveChannel;

binary-compatibility-validator/reference-public-api/kotlinx-coroutines-rx1.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ public final class kotlinx/coroutines/experimental/rx1/RxAwaitKt {
1010
}
1111

1212
public final class kotlinx/coroutines/experimental/rx1/RxChannelKt {
13+
public static final fun consumeEach (Lrx/Observable;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
1314
public static final synthetic fun consumeEach (Lrx/Observable;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
1415
public static final fun iterator (Lrx/Observable;)Lkotlinx/coroutines/experimental/channels/ChannelIterator;
1516
public static final fun open (Lrx/Observable;)Lkotlinx/coroutines/experimental/channels/SubscriptionReceiveChannel;

binary-compatibility-validator/reference-public-api/kotlinx-coroutines-rx2.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ public final class kotlinx/coroutines/experimental/rx2/RxAwaitKt {
1212
}
1313

1414
public final class kotlinx/coroutines/experimental/rx2/RxChannelKt {
15+
public static final fun consumeEach (Lio/reactivex/MaybeSource;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
16+
public static final fun consumeEach (Lio/reactivex/ObservableSource;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
1517
public static final synthetic fun consumeEach (Lio/reactivex/ObservableSource;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/experimental/Continuation;)Ljava/lang/Object;
1618
public static final fun iterator (Lio/reactivex/ObservableSource;)Lkotlinx/coroutines/experimental/channels/ChannelIterator;
1719
public static final fun open (Lio/reactivex/MaybeSource;)Lkotlinx/coroutines/experimental/channels/SubscriptionReceiveChannel;

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
version = 0.24.0-SNAPSHOT
66
group = org.jetbrains.kotlinx
77

8-
kotlin_version = 1.2.51
9-
kotlin_native_version = 0.9-dev-2922
8+
kotlin_version = 1.2.60
9+
kotlin_native_version = 0.8.1
1010
junit_version = 4.12
11-
atomicFU_version = 0.11.0
11+
atomicFU_version = 0.11.1
1212
html_version = 0.6.8
1313
lincheck_version=1.9
1414
dokka_version = 0.9.16-rdev-2-mpp-hacks

ui/kotlinx-coroutines-android/animation-app/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ org.gradle.jvmargs=-Xmx1536m
1818

1919
kotlin.coroutines=enable
2020

21-
kotlin_version = 1.2.51
21+
kotlin_version = 1.2.60
2222
coroutines_version = 0.24.0
2323

ui/kotlinx-coroutines-android/example-app/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ org.gradle.jvmargs=-Xmx1536m
1818

1919
kotlin.coroutines=enable
2020

21-
kotlin_version = 1.2.51
21+
kotlin_version = 1.2.60
2222
coroutines_version = 0.24.0
2323

0 commit comments

Comments
 (0)