Skip to content

Commit 8d6aeaa

Browse files
elizarovelizarov
committed
Merge branch 'version-1.2.2' into develop
2 parents 7699a20 + af2bdfc commit 8d6aeaa

File tree

9 files changed

+36
-8
lines changed

9 files changed

+36
-8
lines changed

‎CHANGES.md

+4
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ General changes:
3838
* Prevent internal names clash that caused errors for ProGuard (#1159).
3939
* POSIX's `nanosleep` as `delay` in `runBlocking ` in K/N (#1225).
4040

41+
## Version 1.2.2
42+
43+
* Kotlin updated to 1.3.40.
44+
4145
## Version 1.2.1
4246

4347
Major:

‎README.md

+4-4
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=1.3.0-M1) ](https://bintray.com/kotlin/kotlinx/kotlinx.coroutines/1.3.0-M1)
66

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

1010
```kotlin
1111
suspend fun main() = coroutineScope {
@@ -89,7 +89,7 @@ And make sure that you use the latest Kotlin version:
8989

9090
```xml
9191
<properties>
92-
<kotlin.version>1.3.31</kotlin.version>
92+
<kotlin.version>1.3.40</kotlin.version>
9393
</properties>
9494
```
9595

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

108108
```groovy
109109
buildscript {
110-
ext.kotlin_version = '1.3.31'
110+
ext.kotlin_version = '1.3.40'
111111
}
112112
```
113113

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

134134
```groovy
135135
plugins {
136-
kotlin("jvm") version "1.3.31"
136+
kotlin("jvm") version "1.3.40"
137137
}
138138
```
139139

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

+20
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@ public class kotlinx/coroutines/CancellableContinuationImpl : kotlin/coroutines/
7878

7979
public final class kotlinx/coroutines/CancellableContinuationKt {
8080
public static final fun disposeOnCancellation (Lkotlinx/coroutines/CancellableContinuation;Lkotlinx/coroutines/DisposableHandle;)V
81+
public static final fun suspendAtomicCancellableCoroutine (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
82+
public static final fun suspendAtomicCancellableCoroutine (ZLkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
83+
public static synthetic fun suspendAtomicCancellableCoroutine$default (ZLkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
84+
public static final fun suspendCancellableCoroutine (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
8185
}
8286

8387
public abstract interface class kotlinx/coroutines/ChildHandle : kotlinx/coroutines/DisposableHandle {
@@ -813,11 +817,13 @@ public final class kotlinx/coroutines/flow/FlowKt {
813817
public static synthetic fun buffer$default (Lkotlinx/coroutines/flow/Flow;IILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
814818
public static final fun callbackFlow (Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/flow/Flow;
815819
public static final fun channelFlow (Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/flow/Flow;
820+
public static final fun collect (Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
816821
public static final fun combineLatest (Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function3;)Lkotlinx/coroutines/flow/Flow;
817822
public static final fun combineLatest (Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function4;)Lkotlinx/coroutines/flow/Flow;
818823
public static final fun combineLatest (Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function5;)Lkotlinx/coroutines/flow/Flow;
819824
public static final fun combineLatest (Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/Flow;Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function6;)Lkotlinx/coroutines/flow/Flow;
820825
public static final fun combineLatest (Lkotlinx/coroutines/flow/Flow;[Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/flow/Flow;
826+
public static final synthetic fun combineLatest (Lkotlinx/coroutines/flow/Flow;[Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/flow/Flow;
821827
public static final fun conflate (Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
822828
public static final fun count (Lkotlinx/coroutines/flow/Flow;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
823829
public static final fun count (Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -831,6 +837,7 @@ public final class kotlinx/coroutines/flow/FlowKt {
831837
public static final fun emitAll (Lkotlinx/coroutines/flow/FlowCollector;Lkotlinx/coroutines/flow/Flow;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
832838
public static final fun emptyFlow ()Lkotlinx/coroutines/flow/Flow;
833839
public static final fun filter (Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/flow/Flow;
840+
public static final synthetic fun filterIsInstance (Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
834841
public static final fun filterNot (Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/flow/Flow;
835842
public static final fun filterNotNull (Lkotlinx/coroutines/flow/Flow;)Lkotlinx/coroutines/flow/Flow;
836843
public static final fun first (Lkotlinx/coroutines/flow/Flow;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -849,6 +856,7 @@ public final class kotlinx/coroutines/flow/FlowKt {
849856
public static synthetic fun flowViaChannel$default (ILkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
850857
public static final fun flowWith (Lkotlinx/coroutines/flow/Flow;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/functions/Function1;)Lkotlinx/coroutines/flow/Flow;
851858
public static synthetic fun flowWith$default (Lkotlinx/coroutines/flow/Flow;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
859+
public static final fun fold (Lkotlinx/coroutines/flow/Flow;Ljava/lang/Object;Lkotlin/jvm/functions/Function3;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
852860
public static final fun getDEFAULT_CONCURRENCY ()I
853861
public static final fun map (Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/flow/Flow;
854862
public static final fun mapNotNull (Lkotlinx/coroutines/flow/Flow;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/flow/Flow;
@@ -979,6 +987,14 @@ public abstract interface class kotlinx/coroutines/selects/SelectInstance {
979987
public abstract fun trySelect (Ljava/lang/Object;)Z
980988
}
981989

990+
public final class kotlinx/coroutines/selects/SelectKt {
991+
public static final fun select (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
992+
}
993+
994+
public final class kotlinx/coroutines/selects/SelectUnbiasedKt {
995+
public static final fun selectUnbiased (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
996+
}
997+
982998
public final class kotlinx/coroutines/selects/UnbiasedSelectBuilderImpl : kotlinx/coroutines/selects/SelectBuilder {
983999
public fun <init> (Lkotlin/coroutines/Continuation;)V
9841000
public final fun getClauses ()Ljava/util/ArrayList;
@@ -992,6 +1008,10 @@ public final class kotlinx/coroutines/selects/UnbiasedSelectBuilderImpl : kotlin
9921008
public fun onTimeout (JLkotlin/jvm/functions/Function1;)V
9931009
}
9941010

1011+
public final class kotlinx/coroutines/selects/WhileSelectKt {
1012+
public static final fun whileSelect (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
1013+
}
1014+
9951015
public abstract interface class kotlinx/coroutines/sync/Mutex {
9961016
public abstract fun getOnLock ()Lkotlinx/coroutines/selects/SelectClause2;
9971017
public abstract fun holdsLock (Ljava/lang/Object;)Z

‎gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Kotlin
22
version=1.3.0-M1-SNAPSHOT
33
group=org.jetbrains.kotlinx
4-
kotlin_version=1.3.31
4+
kotlin_version=1.3.40
55

66
# Dependencies
77
junit_version=4.12
8-
atomicfu_version=0.12.8
8+
atomicfu_version=0.12.9
99
html_version=0.6.8
1010
lincheck_version=2.0
1111
dokka_version=0.9.16-rdev-2-mpp-hacks

‎kotlinx-coroutines-debug/test/CoroutinesDumpTest.kt

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import org.junit.Test
99
import kotlin.coroutines.*
1010
import kotlin.test.*
1111

12+
@Ignore
1213
class CoroutinesDumpTest : DebugTestBase() {
1314
private val monitor = Any()
1415

‎kotlinx-coroutines-debug/test/DebugProbesTest.kt

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import org.junit.Test
88
import java.util.concurrent.*
99
import kotlin.test.*
1010

11+
@Ignore
1112
class DebugProbesTest : TestBase() {
1213

1314
private fun CoroutineScope.createDeferred(): Deferred<*> = async(NonCancellable) {

‎kotlinx-coroutines-debug/test/SanitizedProbesTest.kt

+2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ import kotlinx.coroutines.*
99
import kotlinx.coroutines.debug.*
1010
import kotlinx.coroutines.selects.*
1111
import org.junit.*
12+
import org.junit.Ignore
1213
import org.junit.Test
1314
import java.util.concurrent.*
1415
import kotlin.test.*
1516

17+
@Ignore
1618
class SanitizedProbesTest : DebugTestBase() {
1719
@Before
1820
override fun setUp() {

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

+1-1
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.3.31
21+
kotlin_version=1.3.40
2222
coroutines_version=1.3.0-M1
2323

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

+1-1
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.3.31
21+
kotlin_version=1.3.40
2222
coroutines_version=1.3.0-M1
2323

0 commit comments

Comments
 (0)