Skip to content

Commit 7ab7433

Browse files
authored
Update to Kotlin 1.4.21 (#2473)
1 parent 7d0ad29 commit 7ab7433

File tree

3 files changed

+6
-27
lines changed

3 files changed

+6
-27
lines changed

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
[![official JetBrains project](https://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)](https://www.apache.org/licenses/LICENSE-2.0)
55
[![Download](https://api.bintray.com/packages/kotlin/kotlinx/kotlinx.coroutines/images/download.svg?version=1.4.2) ](https://bintray.com/kotlin/kotlinx/kotlinx.coroutines/1.4.2)
6-
[![Kotlin](https://img.shields.io/badge/kotlin-1.4.20-blue.svg?logo=kotlin)](http://kotlinlang.org)
6+
[![Kotlin](https://img.shields.io/badge/kotlin-1.4.21-blue.svg?logo=kotlin)](http://kotlinlang.org)
77
[![Slack channel](https://img.shields.io/badge/chat-slack-green.svg?logo=slack)](https://kotlinlang.slack.com/messages/coroutines/)
88

99
Library support for Kotlin coroutines with [multiplatform](#multiplatform) support.
10-
This is a companion version for Kotlin `1.4.20` release.
10+
This is a companion version for Kotlin `1.4.21` release.
1111

1212
```kotlin
1313
suspend fun main() = coroutineScope {
@@ -95,7 +95,7 @@ And make sure that you use the latest Kotlin version:
9595

9696
```xml
9797
<properties>
98-
<kotlin.version>1.4.20</kotlin.version>
98+
<kotlin.version>1.4.21</kotlin.version>
9999
</properties>
100100
```
101101

@@ -113,7 +113,7 @@ And make sure that you use the latest Kotlin version:
113113

114114
```groovy
115115
buildscript {
116-
ext.kotlin_version = '1.4.20'
116+
ext.kotlin_version = '1.4.21'
117117
}
118118
```
119119

@@ -139,7 +139,7 @@ And make sure that you use the latest Kotlin version:
139139

140140
```groovy
141141
plugins {
142-
kotlin("jvm") version "1.4.20"
142+
kotlin("jvm") version "1.4.21"
143143
}
144144
```
145145

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Kotlin
66
version=1.4.2-SNAPSHOT
77
group=org.jetbrains.kotlinx
8-
kotlin_version=1.4.20
8+
kotlin_version=1.4.21
99

1010
# Dependencies
1111
junit_version=4.12

js/example-frontend-js/build.gradle

-21
Original file line numberDiff line numberDiff line change
@@ -31,24 +31,3 @@ project.kotlin {
3131
}
3232
}
3333
}
34-
35-
36-
// Workaround for bug in 1.4.20 that will be fixed in 1.4.21, KT-43668
37-
tasks.withType(org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinPackageJsonTask) {
38-
doFirst {
39-
def producerField = it.class.superclass.getDeclaredMethod("getProducer")
40-
producerField.setAccessible(true);
41-
def producer = producerField.invoke(it)
42-
def items = producer.fileCollectionDependencies
43-
def list2 = new HashSet<FileCollectionDependency>()
44-
for (FileCollectionDependency item : items) {
45-
for (File file : item.files) {
46-
if (!file.isFile()) {
47-
list2.add(item)
48-
break
49-
}
50-
}
51-
}
52-
items.removeAll(list2)
53-
}
54-
}

0 commit comments

Comments
 (0)