Merge branch 'master' into develop

Author: qwwdfsad

CHANGES.md

@@ -1,5 +1,33 @@
 # Change log for kotlinx.coroutines
 
+## Version 1.2.0-alpha
+
+* Major debug agent improvements. Real stacktraces are merged with coroutine stacktraces for running coroutines, merging heuristic is improved, API is cleaned up and is on its road to stabilization (#997).
+* `CoroutineTimeout` rule or JUnit4 is introduced to simplify coroutines debugging (#938).
+* Stacktrace recovery improvements. Exceptions with custom properties are no longer copied, `CopyableThrowable` interface is introduced, machinery is [documented](https://github.com/Kotlin/kotlinx.coroutines/blob/develop/docs/debugging.md) (#921, #950).
+* `Dispatchers.Unconfined`, `MainCoroutineDispatcher.immediate`, `MainScope` and `CoroutineScope.cancel` are promoted to stable API (#972).
+* `CompletableJob` is introduced (#971).
+* Structured concurrency is integrated into futures and listenable futures (#1008).
+* `ensurePresent` and `isPresent` extensions for `ThreadLocal` (#1028).
+* `ensureActive` extensions for `CoroutineContext`, `CoroutineScope` and `Job` (#963).
+* `SendChannel.isFull` and `ReceiveChannel.isEmpty` are deprecated (#1053).
+* `withContext` checks cancellation on entering (#962).
+* Operator `invoke` on `CoroutineDispatcher` (#428).
+* Java 8 extensions for `delay` and `withTimeout` now properly handle too large values (#428).
+* Performance of `Dispatcher.Main` initialization is significantly improved (#878).
+* A global exception handler for fatal exceptions in coroutines is introduced (#808, #773).
+* Major improvements in cancellation machinery and exceptions delivery consistency. Cancel with custom exception is completely removed.
+* Kotlin version is updated to 1.3.21.
+* Do not use private API on newer Androids to handle exceptions (#822).
+
+Bug fixes:
+* Proper `select` support in debug agent (#931).
+* Proper `supervisorScope` support in debug agent (#915).
+* Throwing `initCause` does no longer trigger an internal error (#933).
+* Lazy actors are started when calling `close` in order to cleanup their resources (#939).
+* Minor bugs in reactive integrations are fixed (#1008).
+* Experimental scheduler shutdown sequence is fixed (#990).
+
 ## Version 1.1.1
 
 * Maintenance release, no changes in the codebase

README.md

@@ -2,7 +2,7 @@
 
 [![official JetBrains project](https://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
 [![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](https://www.apache.org/licenses/LICENSE-2.0)
-[![Download](https://api.bintray.com/packages/kotlin/kotlinx/kotlinx.coroutines/images/download.svg?version=1.1.1) ](https://bintray.com/kotlin/kotlinx/kotlinx.coroutines/1.1.1)
+[![Download](https://api.bintray.com/packages/kotlin/kotlinx/kotlinx.coroutines/images/download.svg?version=1.2.0-alpha) ](https://bintray.com/kotlin/kotlinx/kotlinx.coroutines/1.2.0-alpha)
 
 Library support for Kotlin coroutines with [multiplatform](#multiplatform) support.
 This is a companion version for Kotlin `1.3.21` release.
@@ -75,7 +75,7 @@ Add dependencies (you can also add other modules that you need):
 <dependency>
     <groupId>org.jetbrains.kotlinx</groupId>
     <artifactId>kotlinx-coroutines-core</artifactId>
-    <version>1.1.1</version>
+    <version>1.2.0-alpha</version>
 </dependency>
 ```
 
@@ -93,7 +93,7 @@ Add dependencies (you can also add other modules that you need):
 
 ```groovy
 dependencies {
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.0-alpha'
 }
 ```
 
@@ -119,7 +119,7 @@ Add dependencies (you can also add other modules that you need):
 
 ```groovy
 dependencies {
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.0-alpha")
 }
 ```
 
@@ -147,7 +147,7 @@ Add [`kotlinx-coroutines-android`](ui/kotlinx-coroutines-android)
 module as dependency when using `kotlinx.coroutines` on Android:
 
 ```groovy
-implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.1'
+implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.0-alpha'
 ```
 This gives you access to Android [Dispatchers.Main](https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-android/kotlinx.coroutines.android/kotlinx.coroutines.-dispatchers/index.html)
 coroutine dispatcher and also makes sure that in case of crashed coroutine with unhandled exception this

bump-version.sh

@@ -16,11 +16,10 @@ update_version() {
 }
 
 update_version "README.md"
-update_version "core/kotlinx-coroutines-debug/README.md"
-update_version "core/kotlinx-coroutines-test/README.md"
+update_version "kotlinx-coroutines-core/README.md"
+update_version "kotlinx-coroutines-debug/README.md"
+update_version "kotlinx-coroutines-test/README.md"
 update_version "ui/coroutines-guide-ui.md"
-update_version "ui/coroutines-guide-ui.md"
-update_version "native/README.md"
 update_version "ui/kotlinx-coroutines-android/example-app/gradle.properties"
 update_version "ui/kotlinx-coroutines-android/animation-app/gradle.properties"
 update_version "gradle.properties"

gradle.properties

@@ -1,5 +1,5 @@
 # Kotlin
-version=1.1.1-SNAPSHOT
+version=1.2.0-alpha-SNAPSHOT
 group=org.jetbrains.kotlinx
 kotlin_version=1.3.21
 

kotlinx-coroutines-debug/README.md

@@ -18,7 +18,7 @@ of coroutines hierarchy referenced by a [Job] or [CoroutineScope] instances usin
 Add `kotlinx-coroutines-debug` to your project test dependencies:
 ```
 dependencies {
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-debug:1.1.1'
+    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-debug:1.2.0-alpha'
 }
 ```
 
@@ -57,7 +57,7 @@ stacktraces will be dumped to the console.
 ### Using as JVM agent
 
 It is possible to use this module as a standalone JVM agent to enable debug probes on the application startup.
-You can run your application with an additional argument: `-javaagent:kotlinx-coroutines-debug-1.1.1.jar`.
+You can run your application with an additional argument: `-javaagent:kotlinx-coroutines-debug-1.2.0-alpha.jar`.
 Additionally, on Linux and Mac OS X you can use `kill -5 $pid` command in order to force your application to print all alive coroutines.
 
 

kotlinx-coroutines-test/README.md

@@ -7,7 +7,7 @@ Test utilities for `kotlinx.coroutines`. Provides `Dispatchers.setMain` to overr
 Add `kotlinx-coroutines-test` to your project test dependencies:
 ```
 dependencies {
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.1.1'
+    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.2.0-alpha'
 }
 ```
 

ui/coroutines-guide-ui.md

@@ -165,7 +165,7 @@ Add dependencies on `kotlinx-coroutines-android` module to the `dependencies { .
 `app/build.gradle` file:
 
 ```groovy
-implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.1"
+implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.0-alpha"
 ```
 
 You can clone [kotlinx.coroutines](https://github.com/Kotlin/kotlinx.coroutines) project from GitHub onto your 

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

@@ -19,5 +19,5 @@ org.gradle.jvmargs=-Xmx1536m
 kotlin.coroutines=enable
 
 kotlin_version=1.3.21
-coroutines_version=1.1.1
+coroutines_version=1.2.0-alpha
 

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

@@ -19,5 +19,5 @@ org.gradle.jvmargs=-Xmx1536m
 kotlin.coroutines=enable
 
 kotlin_version=1.3.21
-coroutines_version=1.1.1
+coroutines_version=1.2.0-alpha