Skip to content

Commit

Permalink
Update to Kotlin 1.4.21 (Kotlin#2473)
Browse files Browse the repository at this point in the history
  • Loading branch information
turansky committed Jan 19, 2021
1 parent 7d0ad29 commit 7ab7433
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 27 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
[![official JetBrains project](https://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](https://www.apache.org/licenses/LICENSE-2.0)
[![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)
[![Kotlin](https://img.shields.io/badge/kotlin-1.4.20-blue.svg?logo=kotlin)](http:https://kotlinlang.org)
[![Kotlin](https://img.shields.io/badge/kotlin-1.4.21-blue.svg?logo=kotlin)](http:https://kotlinlang.org)
[![Slack channel](https://img.shields.io/badge/chat-slack-green.svg?logo=slack)](https://kotlinlang.slack.com/messages/coroutines/)

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

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

```xml
<properties>
<kotlin.version>1.4.20</kotlin.version>
<kotlin.version>1.4.21</kotlin.version>
</properties>
```

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

```groovy
buildscript {
ext.kotlin_version = '1.4.20'
ext.kotlin_version = '1.4.21'
}
```

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

```groovy
plugins {
kotlin("jvm") version "1.4.20"
kotlin("jvm") version "1.4.21"
}
```

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Kotlin
version=1.4.2-SNAPSHOT
group=org.jetbrains.kotlinx
kotlin_version=1.4.20
kotlin_version=1.4.21

# Dependencies
junit_version=4.12
Expand Down
21 changes: 0 additions & 21 deletions js/example-frontend-js/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,24 +31,3 @@ project.kotlin {
}
}
}


// Workaround for bug in 1.4.20 that will be fixed in 1.4.21, KT-43668
tasks.withType(org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinPackageJsonTask) {
doFirst {
def producerField = it.class.superclass.getDeclaredMethod("getProducer")
producerField.setAccessible(true);
def producer = producerField.invoke(it)
def items = producer.fileCollectionDependencies
def list2 = new HashSet<FileCollectionDependency>()
for (FileCollectionDependency item : items) {
for (File file : item.files) {
if (!file.isFile()) {
list2.add(item)
break
}
}
}
items.removeAll(list2)
}
}

0 comments on commit 7ab7433

Please sign in to comment.