Skip to content

Commit 7861411

Browse files
committed
Merge remote-tracking branch 'origin/master' into version-0.25.0
2 parents f5e67ba + ccbf3e0 commit 7861411

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ And make sure that you use the latest Kotlin version:
8080
Add dependencies (you can also add other modules that you need):
8181

8282
```groovy
83-
compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.24.0'
83+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.24.0'
8484
```
8585

8686
And make sure that you use the latest Kotlin version:
@@ -113,7 +113,7 @@ Add [`kotlinx-coroutines-android`](ui/kotlinx-coroutines-android)
113113
module as dependency when using `kotlinx.coroutines` on Android:
114114

115115
```groovy
116-
compile 'org.jetbrains.kotlinx:kotlinx-coroutines-android:0.24.0'
116+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:0.24.0'
117117
```
118118

119119
This gives you access to Android [UI](https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-android/kotlinx.coroutines.experimental.android/-u-i.html)

coroutines-guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,7 @@ It produces the following output (maybe in different order):
847847

848848
<!--- TEST LINES_START_UNORDERED -->
849849

850-
The default dispatcher that we've used in previous sections is representend by [DefaultDispatcher], which
850+
The default dispatcher that we've used in previous sections is represented by [DefaultDispatcher], which
851851
is equal to [CommonPool] in the current implementation. So, `launch { ... }` is the same
852852
as `launch(DefaultDispatcher) { ... }`, which is the same as `launch(CommonPool) { ... }`.
853853

@@ -1849,7 +1849,7 @@ multiple CPU cores if you run it in [CommonPool] context.
18491849

18501850
Anyway, this is an extremely impractical way to find prime numbers. In practice, pipelines do involve some
18511851
other suspending invocations (like asynchronous calls to remote services) and these pipelines cannot be
1852-
built using `buildSeqeunce`/`buildIterator`, because they do not allow arbitrary suspension, unlike
1852+
built using `buildSequence`/`buildIterator`, because they do not allow arbitrary suspension, unlike
18531853
`produce`, which is fully asynchronous.
18541854

18551855
### Fan-out

0 commit comments

Comments
 (0)