Skip to content

Commit fb6ba0d

Browse files
committed
Merge branch 'master' into develop
2 parents 0b886a3 + ea89e60 commit fb6ba0d

File tree

9 files changed

+29
-31
lines changed

9 files changed

+29
-31
lines changed

CHANGES.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Change log for kotlinx.coroutines
22

3+
## Version 1.0.0
4+
5+
* All Kotlin dependencies updated to 1.3 release version.
6+
* Fixed potential memory leak in `HandlerDispatcher.scheduleResumeAfterDelay`, thanks @cbeyls.
7+
* `yield` support for `Unconfined` and immediate dispatchers (#737).
8+
* Various documentation improvements.
9+
310
## Version 1.0.0-RC1
411

512
* Coroutines API is updated to Kotlin 1.3.

COMPATIBILITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ In order to migrate `kotlinx.coroutines` to `1.0.0`, follow these steps:
2020

2121
1. Update `kotlinx.coroutines` to `0.30.2` version.
2222
2. Inspect compiler warnings about deprecated API and migrate it to a proposed alternative. Most of deprecated API has a corresponding replacement which can be applied from IDEA with quickfix.
23-
3. Update Kotlin version to `1.3.0` or to the latest `1.3.0-rc` and `kotlinx.coroutines` to version `0.30.2-eap13`. Then just get rid of `experimental` suffix in all imports.
23+
3. Update Kotlin version to `1.3.0` and `kotlinx.coroutines` to version `0.30.2-eap13`. Then just get rid of `experimental` suffix in all imports.
2424
4. Update `kotlinx.coroutines` to version `1.0.0` or to the corresponding release candidate of it).
2525

README.md

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
[![official JetBrains project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
44
[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0)
5-
[![Download](https://api.bintray.com/packages/kotlin/kotlinx/kotlinx.coroutines/images/download.svg?version=1.0.0-RC1) ](https://bintray.com/kotlin/kotlinx/kotlinx.coroutines/1.0.0-RC1)
5+
[![Download](https://api.bintray.com/packages/kotlin/kotlinx/kotlinx.coroutines/images/download.svg?version=1.0.0) ](https://bintray.com/kotlin/kotlinx/kotlinx.coroutines/1.0.0)
66

77
Library support for Kotlin coroutines with [multiplatform](#multiplatform) support.
8-
This is a companion version for Kotlin `1.3.0-rc-146` release.
8+
This is a companion version for Kotlin `1.3.0` release.
99

1010
**NOTE**: `0.30.2` was the last release with Kotlin 1.2 and experimental coroutines.
1111
See [COMPATIBILITY.md](COMPATIBILITY.md) for details of migration onto the stable Kotlin 1.3 coroutines.
@@ -69,35 +69,33 @@ Add dependencies (you can also add other modules that you need):
6969
<dependency>
7070
<groupId>org.jetbrains.kotlinx</groupId>
7171
<artifactId>kotlinx-coroutines-core</artifactId>
72-
<version>1.0.0-RC1</version>
72+
<version>1.0.0</version>
7373
</dependency>
7474
```
7575

7676
And make sure that you use the latest Kotlin version:
7777

7878
```xml
7979
<properties>
80-
<kotlin.version>1.3.0-rc-146</kotlin.version>
80+
<kotlin.version>1.3.0</kotlin.version>
8181
</properties>
8282
```
8383

84-
While Kotlin 1.3 is still in release candidate status, in order to depend on it you should add eap repository: `https://dl.bintray.com/kotlin/kotlin-eap`.
85-
8684
### Gradle
8785

8886
Add dependencies (you can also add other modules that you need):
8987

9088
```groovy
9189
dependencies {
92-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.0-RC1'
90+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.0'
9391
}
9492
```
9593

9694
And make sure that you use the latest Kotlin version:
9795

9896
```groovy
9997
buildscript {
100-
ext.kotlin_version = '1.3.0-rc-146'
98+
ext.kotlin_version = '1.3.0'
10199
}
102100
```
103101

@@ -115,27 +113,19 @@ Add dependencies (you can also add other modules that you need):
115113

116114
```groovy
117115
dependencies {
118-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.0-RC1")
116+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.0.0")
119117
}
120118
```
121119

122120
And make sure that you use the latest Kotlin version:
123121

124122
```groovy
125123
plugins {
126-
kotlin("jvm") version "1.3.0-rc-146"
124+
kotlin("jvm") version "1.3.0"
127125
}
128126
```
129127

130128
Make sure that you have either `jcenter()` or `mavenCentral()` in the list of repositories.
131-
For Kotlin EAP builds you also may need `kotlin-eap` repository:
132-
133-
```
134-
repository {
135-
jcenter()
136-
maven { url "https://kotlin.bintray.com/kotlin-eap" }
137-
}
138-
```
139129

140130
### Multiplatform
141131

@@ -151,7 +141,7 @@ Add [`kotlinx-coroutines-android`](ui/kotlinx-coroutines-android)
151141
module as dependency when using `kotlinx.coroutines` on Android:
152142

153143
```groovy
154-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.0.0-RC1'
144+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.0.0'
155145
```
156146
This gives you access to Android [Dispatchers.Main](https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-android/kotlinx.coroutines.android/kotlinx.coroutines.-dispatchers/index.html)
157147
coroutine dispatcher and also makes sure that in case of crashed coroutine with unhandled exception this

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ allprojects {
6262
google()
6363
}
6464
jcenter()
65+
maven { url "https://kotlin.bintray.com/kotlin-dev" }
6566
maven { url "https://kotlin.bintray.com/kotlin-eap" }
6667
maven { url "https://kotlin.bintray.com/kotlinx" }
6768
}

gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Kotlin
2-
version=1.0.0-RC1-SNAPSHOT
2+
version=1.0.0-SNAPSHOT
33
group=org.jetbrains.kotlinx
4-
kotlin_version=1.3.0-rc-146
5-
kotlin_native_version=1.3.0-rc-146
4+
kotlin_version=1.3.0
5+
kotlin_native_version=1.3.0-rc-208
66

77
# Dependencies
88
junit_version=4.12
9-
atomicFU_version=0.11.11
9+
atomicFU_version=0.11.12
1010
html_version=0.6.8
1111
lincheck_version=1.9
1212
dokka_version=0.9.16-rdev-2-mpp-hacks

native/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ repositories {
4242
}
4343
4444
dependencies {
45-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-native:1.0.0-RC1'
45+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-native:1.0.0'
4646
}
4747
4848
sourceSets {

ui/coroutines-guide-ui.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ Add dependencies on `kotlinx-coroutines-android` module to the `dependencies { .
165165
`app/build.gradle` file:
166166

167167
```groovy
168-
compile "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.0.0-RC1"
168+
compile "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.0.0"
169169
```
170170

171171
You can clone [kotlinx.coroutines](https://github.com/Kotlin/kotlinx.coroutines) project from GitHub onto your
@@ -556,7 +556,7 @@ suspend fun CoroutineScope.launchInIO() = launch(Dispatchers.IO) {
556556
Parent-child relation between jobs forms a hierarchy. A coroutine that performs some background job on behalf of
557557
the view and in its context can create further children coroutines. The whole tree of coroutines gets cancelled
558558
when the parent job is cancelled. An example of that is shown in the
559-
["Children of a coroutine"](../docs/coroutines-guide.md#children-of-a-coroutine) section of the guide to coroutines.
559+
["Children of a coroutine"](../docs/coroutine-context-and-dispatchers.md#children-of-a-coroutine) section of the guide to coroutines.
560560
<!--- CLEAR -->
561561

562562
### Blocking operations

ui/kotlinx-coroutines-android/animation-app/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ org.gradle.jvmargs=-Xmx1536m
1818

1919
kotlin.coroutines=enable
2020

21-
kotlin_version=1.3.0-rc-146
22-
coroutines_version=1.0.0-RC1
21+
kotlin_version=1.3.0
22+
coroutines_version=1.0.0
2323

ui/kotlinx-coroutines-android/example-app/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ org.gradle.jvmargs=-Xmx1536m
1818

1919
kotlin.coroutines=enable
2020

21-
kotlin_version=1.3.0-rc-146
22-
coroutines_version=1.0.0-RC1
21+
kotlin_version=1.3.0
22+
coroutines_version=1.0.0
2323

0 commit comments

Comments
 (0)