Merge branch 'develop' into coroutines-scheduler-forcepush

# Conflicts:
#	benchmarks/src/jmh/kotlin/benchmarks/PingPongActorBenchmark.kt
#	core/kotlinx-coroutines-core/src/CommonPool.kt
#	core/kotlinx-coroutines-core/src/test/kotlin/kotlinx/coroutines/experimental/WithContextCommonPoolTest.kt
#	core/kotlinx-coroutines-core/src/test/kotlin/kotlinx/coroutines/experimental/WithDefaultContextTest.kt
#	core/kotlinx-coroutines-core/test/TestBase.kt
#	core/kotlinx-coroutines-core/test/WithContextCommonPoolTest.kt
#	integration/kotlinx-coroutines-jdk8/src/test/kotlin/examples/ToFuture-example.kt

Author: qwwdfsad

CHANGES.md

@@ -1,5 +1,15 @@
 # Change log for kotlinx.coroutines
 
+## Version 0.23.4
+
+* Recompiled with Kotlin 1.2.51 to solve broken metadata problem (see [KT-24944](https://youtrack.jetbrains.com/issue/KT-24944)).
+
+## Version 0.23.3
+
+* Kotlin 1.2.50.
+* JS: Moved to atomicfu version 0.10.3 that properly matches NPM & Kotlin/JS module names (see #396).
+* Improve source-code compatibility with previous (0.22.x) version of `openChannel().use { ... }` pattern by providing deprecated extension function `use` on `ReceiveChannel`.
+
 ## Version 0.23.2
 
 * IO: fix joining and continuous writing byte array interference.

LICENSE.txt

@@ -0,0 +1,13 @@
+Copyright 2016-2018 JetBrains s.r.o.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

README.md

@@ -2,12 +2,10 @@
 
 [![official JetBrains project](http://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)](http://www.apache.org/licenses/LICENSE-2.0)
-[![Download](https://api.bintray.com/packages/kotlin/kotlinx/kotlinx.coroutines/images/download.svg?version=0.23.2) ](https://bintray.com/kotlin/kotlinx/kotlinx.coroutines/0.23.2)
+[![Download](https://api.bintray.com/packages/kotlin/kotlinx/kotlinx.coroutines/images/download.svg?version=0.23.4) ](https://bintray.com/kotlin/kotlinx/kotlinx.coroutines/0.23.4)
 
-Library support for Kotlin coroutines in
-[Kotlin/JVM](core/README.md) and
-[Kotlin/JS](js/README.md).
-This is a companion version for Kotlin 1.2.21 release.
+Library support for Kotlin coroutines with [multiplatform](#multiplatform) support.
+This is a companion version for Kotlin 1.2.51 release.
 
 ```kotlin
 launch {
@@ -22,12 +20,13 @@ launch {
   * `launch` and `async` coroutine builders;
   * `Job` and `Deferred` light-weight future with cancellation support;
   * `delay` and `yield` top-level suspending functions.
-* [js](js/README.md) — Kotlin/JS implementation of common coroutines with `Promise` support.
 * [core](core/README.md) — Kotlin/JVM implementation of common coroutines with additional features:
   * `CommonPool` coroutine context (default on JVM);
   * `Channel` and `Mutex` communication and synchronization primitives;
   * `produce` and `actor` coroutine builders;
   * `select` expression support and more.
+* [js](js/README.md) — Kotlin/JS implementation of common coroutines with `Promise` support.
+* [native](native/README.md) — Kotlin/Native implementation of common coroutines with `runBlocking` single-threaded event loop.
 * [reactive](reactive/README.md) — modules that provide builders and iteration support for various reactive streams libraries:
   * Reactive Streams, RxJava 1.x and 2.x and Project Reactor. 
 * [ui](ui/README.md) — modules that provide coroutine dispatchers for various single-threaded UI libraries:
@@ -64,15 +63,15 @@ Add dependencies (you can also add other modules that you need):
 <dependency>
     <groupId>org.jetbrains.kotlinx</groupId>
     <artifactId>kotlinx-coroutines-core</artifactId>
-    <version>0.23.2</version>
+    <version>0.23.4</version>
 </dependency>
 ```
 
 And make sure that you use the latest Kotlin version:
 
 ```xml
 <properties>
-    <kotlin.version>1.2.21</kotlin.version>
+    <kotlin.version>1.2.51</kotlin.version>
 </properties>
 ```
 
@@ -81,14 +80,14 @@ And make sure that you use the latest Kotlin version:
 Add dependencies (you can also add other modules that you need):
 
 ```groovy
-compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.23.2'
+compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.23.4'
 ```
 
 And make sure that you use the latest Kotlin version:
 
 ```groovy
 buildscript {
-    ext.kotlin_version = '1.2.21'
+    ext.kotlin_version = '1.2.51'
 }
 ```
 
@@ -100,10 +99,27 @@ repository {
 }
 ```
 
-### Kotlin/JS
+### Multiplatform
+
+Core modules of `kotlinx.coroutines` are also available for 
+[Kotlin/JS](js/README.md) and [Kotlin/Native](native/README.md). If you write
+a common code that should get compiled or different platforms, add 
+[`org.jetbrains.kotlinx:kotlinx-coroutines-core-common:<version>`](common/kotlinx-coroutines-core-common/README.md) 
+to your common code dependencies.
+
+### Android
+
+Add [`kotlinx-coroutines-android`](ui/kotlinx-coroutines-android)
+module as dependency when using `kotlinx.coroutines` on Android:
+
+```groovy
+compile 'org.jetbrains.kotlinx:kotlinx-coroutines-android:0.23.4'
+```
 
-Use `org.jetbrains.kotlinx:kotlinx-coroutines-core-js:<version>` artifact in your Gradle/Maven dependencies 
-or install [`kotlinx-coroutines-core`](https://www.npmjs.com/package/kotlinx-coroutines-core) package via NPM. 
+This gives you access to Android [UI](https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-android/kotlinx.coroutines.experimental.android/-u-i.html)
+coroutine dispatcher and also makes sure that in case of crashed coroutine with unhandled exception this
+exception is logged before crashing Android application, similarly to the way uncaught exceptions in 
+threads are handled by Android runtime. 
 
 ### ProGuard
 

benchmarks/build.gradle

@@ -1,3 +1,7 @@
+/*
+ * Copyright 2016-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
+ */
+
 plugins {
     id "me.champeau.gradle.jmh" version "0.4.4"
 }

benchmarks/src/jmh/kotlin/benchmarks/CancellableContinuationBenchmark.kt

@@ -1,3 +1,7 @@
+/*
+ * Copyright 2016-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
+ */
+
 package benchmarks
 
 import kotlinx.coroutines.experimental.*

benchmarks/src/jmh/kotlin/benchmarks/ChannelCopyBenchmark.kt

@@ -1,3 +1,7 @@
+/*
+ * Copyright 2016-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
+ */
+
 package benchmarks
 
 import kotlinx.coroutines.experimental.*

benchmarks/src/jmh/kotlin/benchmarks/GuideSyncBenchmark.kt

@@ -1,32 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle America, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *  * Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- *  * Neither the name of Oracle nor the names of its contributors may be used
- *    to endorse or promote products derived from this software without
- *    specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
+ * Copyright 2016-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package benchmarks

benchmarks/src/jmh/kotlin/benchmarks/ParametrizedDispatcherBase.kt

@@ -4,7 +4,7 @@ import benchmarks.actors.CORES_COUNT
 import kotlinx.coroutines.experimental.CommonPool
 import kotlinx.coroutines.experimental.ThreadPoolDispatcher
 import kotlinx.coroutines.experimental.newFixedThreadPoolContext
-import kotlinx.coroutines.experimental.scheduling.ExperimentalCoroutineDispatcher
+import scheduling.ExperimentalCoroutineDispatcher
 import org.openjdk.jmh.annotations.Param
 import org.openjdk.jmh.annotations.Setup
 import org.openjdk.jmh.annotations.TearDown

benchmarks/src/jmh/kotlin/benchmarks/actors/PingPongWithBlockingContext.kt

@@ -2,8 +2,8 @@ package benchmarks.actors
 
 import kotlinx.coroutines.experimental.*
 import kotlinx.coroutines.experimental.channels.*
-import kotlinx.coroutines.experimental.scheduling.*
 import org.openjdk.jmh.annotations.*
+import scheduling.*
 import java.util.concurrent.*
 import kotlin.coroutines.experimental.*
 

binary-compatibility-validator/build.gradle

@@ -1,3 +1,7 @@
+/*
+ * Copyright 2016-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
+ */
+
 configurations {
     testArtifacts
 }
@@ -37,7 +41,7 @@ compileTestKotlin {
 sourceSets {
     test {
         java {
-            srcDir "src/test/kotlin"
+            srcDir "test/cases"
         }
     }
 }