Skip to content

Commit f74e153

Browse files
committed
Merge branch 'master' into develop
# Conflicts: # README.md # coroutines-guide.md # docs/basics.md # docs/cfg/buildprofiles.xml # docs/kc.tree # docs/topics/coroutines-basic-jvm.md # docs/topics/coroutines-guide.md # docs/topics/debugging.md # docs/topics/knit.properties
2 parents f5983c5 + dda99e2 commit f74e153

22 files changed

+404
-22
lines changed

coroutines-guide.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ The main coroutines guide has moved to the [docs folder](docs/topics/coroutines-
22

33
## Table of contents
44

5-
<!--- TOC_REF docs/topics/basics.md -->
5+
<!--- TOC_REF docs/topics/coroutines-basics.md -->
66
<!--- TOC_REF docs/topics/cancellation-and-timeouts.md -->
77
<!--- TOC_REF docs/topics/composing-suspending-functions.md -->
88
<!--- TOC_REF docs/topics/coroutine-context-and-dispatchers.md -->

docs/basics.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
The documentation has been moved to the [https://kotlinlang.org/docs/basics.html](https://kotlinlang.org/docs/basics.html) page.
1+
The documentation has been moved to the [https://kotlinlang.org/docs/coroutines-basics.html](https://kotlinlang.org/docs/coroutines-basics.html) page.
22

3-
To edit the documentation, open the [topics/basics.md](topics/basics.md) page.
3+
To edit the documentation, open the [topics/coroutines-basics.md](topics/coroutines-basics.md) page.

docs/cfg/buildprofiles.xml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<variables>
55
<enable-browser-edits>true</enable-browser-edits>
66
<browser-edits-url>https://github.com/Kotlin/kotlinx.coroutines/edit/master/</browser-edits-url>
7+
<allow-indexable-eaps>true</allow-indexable-eaps>
78
</variables>
89
<build-profile product="kc"/>
910
</buildprofiles>

docs/kc.tree

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<toc-element id="coroutines-guide.md"/>
1111
<toc-element id="async-programming.md"/>
12-
<toc-element id="basics.md"/>
12+
<toc-element id="coroutines-basics.md"/>
1313
<toc-element id="coroutines-basic-jvm.md"/>
1414
<toc-element toc-title="Intro to coroutines and channels – hands-on tutorial" href="https://play.kotlinlang.org/hands-on/Introduction%20to%20Coroutines%20and%20Channels/"/>
1515
<toc-element id="cancellation-and-timeouts.md"/>
@@ -23,4 +23,4 @@
2323
<toc-element id="debug-coroutines-with-idea.md"/>
2424
<toc-element id="debug-flow-with-idea.md"/>
2525

26-
</product-profile>
26+
</product-profile>

docs/topics/coroutines-basic-jvm.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies {
3232
```
3333
</tabs>
3434

35-
This library is published to Maven Central repository, so add the following:
35+
This library is published to the [Maven Central repository](https://search.maven.org/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-core), so add the following:
3636

3737
```groovy
3838
repositories {
@@ -77,6 +77,8 @@ Since we'll be using the [`kotlinx.coroutines`](https://github.com/Kotlin/kotlin
7777
</dependencies>
7878
```
7979

80+
This library is published to the [Maven Central repository](https://search.maven.org/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-core), which Maven will download from by default.
81+
8082
That's it, we are good to go and write code under `src/main/kotlin`.
8183

8284
## My first coroutine

0 commit comments

Comments
 (0)