Skip to content

Commit bc5a0c4

Browse files
committed
Merge remote-tracking branch 'origin/master' into develop
2 parents ad68c06 + 9669578 commit bc5a0c4

24 files changed

+33
-84
lines changed

core/kotlinx-coroutines-core/src/test/kotlin/guide/example-basic-01.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
// This file was automatically generated from coroutines-guide.md by Knit tool. Do not edit.
1818
package guide.basic.example01
1919

20-
import kotlinx.coroutines.experimental.delay
21-
import kotlinx.coroutines.experimental.launch
20+
import kotlinx.coroutines.experimental.*
2221

2322
fun main(args: Array<String>) {
2423
launch { // launch new coroutine

core/kotlinx-coroutines-core/src/test/kotlin/guide/example-basic-02.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
// This file was automatically generated from coroutines-guide.md by Knit tool. Do not edit.
1818
package guide.basic.example02
1919

20-
import kotlinx.coroutines.experimental.delay
21-
import kotlinx.coroutines.experimental.launch
22-
import kotlinx.coroutines.experimental.runBlocking
20+
import kotlinx.coroutines.experimental.*
2321

2422
fun main(args: Array<String>) = runBlocking<Unit> { // start main coroutine
2523
launch { // launch new coroutine

core/kotlinx-coroutines-core/src/test/kotlin/guide/example-basic-03.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
// This file was automatically generated from coroutines-guide.md by Knit tool. Do not edit.
1818
package guide.basic.example03
1919

20-
import kotlinx.coroutines.experimental.delay
21-
import kotlinx.coroutines.experimental.launch
22-
import kotlinx.coroutines.experimental.runBlocking
20+
import kotlinx.coroutines.experimental.*
2321

2422
fun main(args: Array<String>) = runBlocking<Unit> {
2523
val job = launch { // launch new coroutine and keep a reference to its Job

core/kotlinx-coroutines-core/src/test/kotlin/guide/example-basic-04.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
// This file was automatically generated from coroutines-guide.md by Knit tool. Do not edit.
1818
package guide.basic.example04
1919

20-
import kotlinx.coroutines.experimental.delay
21-
import kotlinx.coroutines.experimental.launch
22-
import kotlinx.coroutines.experimental.runBlocking
20+
import kotlinx.coroutines.experimental.*
2321

2422
fun main(args: Array<String>) = runBlocking<Unit> {
2523
val job = launch { doWorld() }

core/kotlinx-coroutines-core/src/test/kotlin/guide/example-basic-05.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
// This file was automatically generated from coroutines-guide.md by Knit tool. Do not edit.
1818
package guide.basic.example05
1919

20-
import kotlinx.coroutines.experimental.delay
21-
import kotlinx.coroutines.experimental.launch
22-
import kotlinx.coroutines.experimental.runBlocking
20+
import kotlinx.coroutines.experimental.*
2321

2422
fun main(args: Array<String>) = runBlocking<Unit> {
2523
val jobs = List(100_000) { // launch a lot of coroutines and list their jobs

core/kotlinx-coroutines-core/src/test/kotlin/guide/example-basic-06.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
// This file was automatically generated from coroutines-guide.md by Knit tool. Do not edit.
1818
package guide.basic.example06
1919

20-
import kotlinx.coroutines.experimental.delay
21-
import kotlinx.coroutines.experimental.launch
22-
import kotlinx.coroutines.experimental.runBlocking
20+
import kotlinx.coroutines.experimental.*
2321

2422
fun main(args: Array<String>) = runBlocking<Unit> {
2523
launch {

core/kotlinx-coroutines-core/src/test/kotlin/guide/example-cancel-01.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
// This file was automatically generated from coroutines-guide.md by Knit tool. Do not edit.
1818
package guide.cancel.example01
1919

20-
import kotlinx.coroutines.experimental.delay
21-
import kotlinx.coroutines.experimental.launch
22-
import kotlinx.coroutines.experimental.runBlocking
20+
import kotlinx.coroutines.experimental.*
2321

2422
fun main(args: Array<String>) = runBlocking<Unit> {
2523
val job = launch {

core/kotlinx-coroutines-core/src/test/kotlin/guide/example-cancel-02.kt

+1-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@
1717
// This file was automatically generated from coroutines-guide.md by Knit tool. Do not edit.
1818
package guide.cancel.example02
1919

20-
import kotlinx.coroutines.experimental.cancelAndJoin
21-
import kotlinx.coroutines.experimental.delay
22-
import kotlinx.coroutines.experimental.launch
23-
import kotlinx.coroutines.experimental.runBlocking
20+
import kotlinx.coroutines.experimental.*
2421

2522
fun main(args: Array<String>) = runBlocking<Unit> {
2623
val startTime = System.currentTimeMillis()

core/kotlinx-coroutines-core/src/test/kotlin/guide/example-cancel-03.kt

+1-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@
1717
// This file was automatically generated from coroutines-guide.md by Knit tool. Do not edit.
1818
package guide.cancel.example03
1919

20-
import kotlinx.coroutines.experimental.cancelAndJoin
21-
import kotlinx.coroutines.experimental.delay
22-
import kotlinx.coroutines.experimental.launch
23-
import kotlinx.coroutines.experimental.runBlocking
20+
import kotlinx.coroutines.experimental.*
2421

2522
fun main(args: Array<String>) = runBlocking<Unit> {
2623
val startTime = System.currentTimeMillis()

core/kotlinx-coroutines-core/src/test/kotlin/guide/example-cancel-04.kt

+1-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@
1717
// This file was automatically generated from coroutines-guide.md by Knit tool. Do not edit.
1818
package guide.cancel.example04
1919

20-
import kotlinx.coroutines.experimental.cancelAndJoin
21-
import kotlinx.coroutines.experimental.delay
22-
import kotlinx.coroutines.experimental.launch
23-
import kotlinx.coroutines.experimental.runBlocking
20+
import kotlinx.coroutines.experimental.*
2421

2522
fun main(args: Array<String>) = runBlocking<Unit> {
2623
val job = launch {

core/kotlinx-coroutines-core/src/test/kotlin/guide/example-channel-01.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717
// This file was automatically generated from coroutines-guide.md by Knit tool. Do not edit.
1818
package guide.channel.example01
1919

20-
import kotlinx.coroutines.experimental.channels.Channel
21-
import kotlinx.coroutines.experimental.launch
22-
import kotlinx.coroutines.experimental.runBlocking
20+
import kotlinx.coroutines.experimental.*
21+
import kotlinx.coroutines.experimental.channels.*
2322

2423
fun main(args: Array<String>) = runBlocking<Unit> {
2524
val channel = Channel<Int>()

core/kotlinx-coroutines-core/src/test/kotlin/guide/example-channel-02.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717
// This file was automatically generated from coroutines-guide.md by Knit tool. Do not edit.
1818
package guide.channel.example02
1919

20-
import kotlinx.coroutines.experimental.channels.Channel
21-
import kotlinx.coroutines.experimental.launch
22-
import kotlinx.coroutines.experimental.runBlocking
20+
import kotlinx.coroutines.experimental.*
21+
import kotlinx.coroutines.experimental.channels.*
2322

2423
fun main(args: Array<String>) = runBlocking<Unit> {
2524
val channel = Channel<Int>()

core/kotlinx-coroutines-core/src/test/kotlin/guide/example-channel-03.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717
// This file was automatically generated from coroutines-guide.md by Knit tool. Do not edit.
1818
package guide.channel.example03
1919

20-
import kotlinx.coroutines.experimental.channels.consumeEach
21-
import kotlinx.coroutines.experimental.channels.produce
22-
import kotlinx.coroutines.experimental.runBlocking
20+
import kotlinx.coroutines.experimental.*
21+
import kotlinx.coroutines.experimental.channels.*
2322

2423
fun produceSquares() = produce<Int> {
2524
for (x in 1..5) send(x * x)

core/kotlinx-coroutines-core/src/test/kotlin/guide/example-channel-04.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717
// This file was automatically generated from coroutines-guide.md by Knit tool. Do not edit.
1818
package guide.channel.example04
1919

20-
import kotlinx.coroutines.experimental.channels.ReceiveChannel
21-
import kotlinx.coroutines.experimental.channels.produce
22-
import kotlinx.coroutines.experimental.runBlocking
20+
import kotlinx.coroutines.experimental.*
21+
import kotlinx.coroutines.experimental.channels.*
2322

2423
fun produceNumbers() = produce<Int> {
2524
var x = 1

core/kotlinx-coroutines-core/src/test/kotlin/guide/example-channel-06.kt

+2-6
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,8 @@
1717
// This file was automatically generated from coroutines-guide.md by Knit tool. Do not edit.
1818
package guide.channel.example06
1919

20-
import kotlinx.coroutines.experimental.channels.ReceiveChannel
21-
import kotlinx.coroutines.experimental.channels.consumeEach
22-
import kotlinx.coroutines.experimental.channels.produce
23-
import kotlinx.coroutines.experimental.delay
24-
import kotlinx.coroutines.experimental.launch
25-
import kotlinx.coroutines.experimental.runBlocking
20+
import kotlinx.coroutines.experimental.*
21+
import kotlinx.coroutines.experimental.channels.*
2622

2723
fun produceNumbers() = produce<Int> {
2824
var x = 1 // start from 1

core/kotlinx-coroutines-core/src/test/kotlin/guide/example-compose-02.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
// This file was automatically generated from coroutines-guide.md by Knit tool. Do not edit.
1818
package guide.compose.example02
1919

20-
import kotlinx.coroutines.experimental.async
21-
import kotlinx.coroutines.experimental.delay
22-
import kotlinx.coroutines.experimental.runBlocking
20+
import kotlinx.coroutines.experimental.*
2321
import kotlin.system.measureTimeMillis
2422

2523
suspend fun doSomethingUsefulOne(): Int {

core/kotlinx-coroutines-core/src/test/kotlin/guide/example-compose-03.kt

+1-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@
1717
// This file was automatically generated from coroutines-guide.md by Knit tool. Do not edit.
1818
package guide.compose.example03
1919

20-
import kotlinx.coroutines.experimental.CoroutineStart
21-
import kotlinx.coroutines.experimental.async
22-
import kotlinx.coroutines.experimental.delay
23-
import kotlinx.coroutines.experimental.runBlocking
20+
import kotlinx.coroutines.experimental.*
2421
import kotlin.system.measureTimeMillis
2522

2623
suspend fun doSomethingUsefulOne(): Int {

core/kotlinx-coroutines-core/src/test/kotlin/guide/example-compose-04.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
// This file was automatically generated from coroutines-guide.md by Knit tool. Do not edit.
1818
package guide.compose.example04
1919

20-
import kotlinx.coroutines.experimental.async
21-
import kotlinx.coroutines.experimental.delay
22-
import kotlinx.coroutines.experimental.runBlocking
20+
import kotlinx.coroutines.experimental.*
2321
import kotlin.system.measureTimeMillis
2422

2523
suspend fun doSomethingUsefulOne(): Int {

core/kotlinx-coroutines-core/src/test/kotlin/guide/example-context-06.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
// This file was automatically generated from coroutines-guide.md by Knit tool. Do not edit.
1818
package guide.context.example06
1919

20-
import kotlinx.coroutines.experimental.delay
21-
import kotlinx.coroutines.experimental.launch
22-
import kotlinx.coroutines.experimental.runBlocking
20+
import kotlinx.coroutines.experimental.*
2321

2422
fun main(args: Array<String>) = runBlocking<Unit> {
2523
// launch a coroutine to process some kind of incoming request

core/kotlinx-coroutines-core/src/test/kotlin/guide/example-context-08.kt

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
// This file was automatically generated from coroutines-guide.md by Knit tool. Do not edit.
1818
package guide.context.example08
1919

20-
import kotlinx.coroutines.experimental.delay
21-
import kotlinx.coroutines.experimental.launch
22-
import kotlinx.coroutines.experimental.runBlocking
20+
import kotlinx.coroutines.experimental.*
2321

2422
fun main(args: Array<String>) = runBlocking<Unit> {
2523
// launch a coroutine to process some kind of incoming request

core/kotlinx-coroutines-core/src/test/kotlin/guide/example-context-09.kt

+1-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@
1717
// This file was automatically generated from coroutines-guide.md by Knit tool. Do not edit.
1818
package guide.context.example09
1919

20-
import kotlinx.coroutines.experimental.CoroutineName
21-
import kotlinx.coroutines.experimental.async
22-
import kotlinx.coroutines.experimental.delay
23-
import kotlinx.coroutines.experimental.runBlocking
20+
import kotlinx.coroutines.experimental.*
2421

2522
fun log(msg: String) = println("[${Thread.currentThread().name}] $msg")
2623

core/kotlinx-coroutines-core/src/test/kotlin/guide/example-select-04.kt

+3-5
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,9 @@
1717
// This file was automatically generated from coroutines-guide.md by Knit tool. Do not edit.
1818
package guide.select.example04
1919

20-
import kotlinx.coroutines.experimental.Deferred
21-
import kotlinx.coroutines.experimental.async
22-
import kotlinx.coroutines.experimental.delay
23-
import kotlinx.coroutines.experimental.runBlocking
24-
import kotlinx.coroutines.experimental.selects.select
20+
import kotlinx.coroutines.experimental.*
21+
import kotlinx.coroutines.experimental.channels.*
22+
import kotlinx.coroutines.experimental.selects.*
2523
import java.util.*
2624

2725
fun asyncString(time: Int) = async {

core/kotlinx-coroutines-core/src/test/kotlin/guide/example-select-05.kt

+2-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@
1818
package guide.select.example05
1919

2020
import kotlinx.coroutines.experimental.*
21-
import kotlinx.coroutines.experimental.channels.Channel
22-
import kotlinx.coroutines.experimental.channels.ReceiveChannel
23-
import kotlinx.coroutines.experimental.channels.produce
24-
import kotlinx.coroutines.experimental.selects.select
21+
import kotlinx.coroutines.experimental.channels.*
22+
import kotlinx.coroutines.experimental.selects.*
2523

2624
fun switchMapDeferreds(input: ReceiveChannel<Deferred<String>>) = produce<String> {
2725
var current = input.receive() // start with first received deferred value

core/kotlinx-coroutines-core/src/test/kotlin/guide/example-sync-07.kt

+2-5
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,10 @@
1717
// This file was automatically generated from coroutines-guide.md by Knit tool. Do not edit.
1818
package guide.sync.example07
1919

20-
import kotlinx.coroutines.experimental.CommonPool
21-
import kotlinx.coroutines.experimental.CompletableDeferred
22-
import kotlinx.coroutines.experimental.channels.actor
23-
import kotlinx.coroutines.experimental.launch
24-
import kotlinx.coroutines.experimental.runBlocking
20+
import kotlinx.coroutines.experimental.*
2521
import kotlin.coroutines.experimental.CoroutineContext
2622
import kotlin.system.measureTimeMillis
23+
import kotlinx.coroutines.experimental.channels.*
2724

2825
suspend fun massiveRun(context: CoroutineContext, action: suspend () -> Unit) {
2926
val n = 1000 // number of coroutines to launch

0 commit comments

Comments
 (0)