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

Lines changed: 1 addition & 2 deletions
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

Lines changed: 1 addition & 3 deletions
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

Lines changed: 1 addition & 3 deletions
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

Lines changed: 1 addition & 3 deletions
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

Lines changed: 1 addition & 3 deletions
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

Lines changed: 1 addition & 3 deletions
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

Lines changed: 1 addition & 3 deletions
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

Lines changed: 1 addition & 4 deletions
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

Lines changed: 1 addition & 4 deletions
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

Lines changed: 1 addition & 4 deletions
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 {

0 commit comments

Comments
 (0)