diff --git a/CHANGES.md b/CHANGES.md index b4c2a7bdd6..089b1991b3 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -20,12 +20,11 @@ * Fixed the problem that prevented implementation via delegation for `Job` interface (#2423) * Fixed incorrect ProGuard rules that allowed shrinking volatile felds (#1564) -* Fixed `await/`asDeferred` for `MinimalState` implementations in jdk8 module (#2456) +* Fixed `await`/`asDeferred` for `MinimalStage` implementations in jdk8 module (#2456) * Fixed bug when `onUndeliveredElement` wasn't called for unlimited channels (#2435) * Fixed a bug when `ListenableFuture.isCancelled` returned from `asListenableFuture` could have thrown an exception, thanks to @vadimsemenov (#2421) * Coroutine in `callbackFlow` and `produce` is properly cancelled when the channel was closed separately (#2506) - ## Version 1.4.2 * Fixed `StackOverflowError` in `Job.toString` when `Job` is observed in its intermediate state (#2371). diff --git a/README.md b/README.md index 08417dd0f5..e6e1d237e6 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![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.3) ](https://bintray.com/kotlin/kotlinx/kotlinx.coroutines/1.4.3) +[![Download](https://img.shields.io/maven-central/v/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.4.3)](https://search.maven.org/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.4.3/pom) [![Kotlin](https://img.shields.io/badge/kotlin-1.4.30-blue.svg?logo=kotlin)](http://kotlinlang.org) [![Slack channel](https://img.shields.io/badge/chat-slack-green.svg?logo=slack)](https://kotlinlang.slack.com/messages/coroutines/) diff --git a/RELEASE.md b/RELEASE.md index c9fd83fb8e..edc7726a0a 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -34,7 +34,7 @@ To release new `` of `kotlinx-coroutines`: 7. Commit updated files to a new version branch:
`git commit -a -m "Version "` -8. Push new version into the branch:
+8. Push the new version into the branch:
`git push -u origin version-` 9. Create Pull-Request on GitHub from `version-` branch into `master`: diff --git a/gradle.properties b/gradle.properties index 40b1596105..db1a782ba9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -55,7 +55,7 @@ jekyll_version=4.0 org.gradle.jvmargs=-Xmx2g # Workaround for Bintray treating .sha512 files as artifacts -# https://github.com/gradle/gradle/issues/1.4.3 +# https://github.com/gradle/gradle/issues/11412 systemProp.org.gradle.internal.publish.checksums.insecure=true # todo:KLUDGE: This is commented out, and the property is set conditionally in build.gradle, because IDEA doesn't work with it. diff --git a/site/deploy.sh b/site/deploy.sh index de7cdef281..fd510aae0b 100755 --- a/site/deploy.sh +++ b/site/deploy.sh @@ -1,5 +1,9 @@ #!/usr/bin/env bash +# +# Copyright 2016-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. +# + # Abort on first error set -e @@ -47,7 +51,8 @@ git rm `find . -type f -not -name '*.html' -not -name '.git'` > /dev/null echo "Redirecting experimental pages" git_add=() git_rm=() -for file in `find . -type f -name '*.html'` ; do +`find . -type f -name '*.html'` | while read file +do match=nothing_is_found if [[ $file =~ \.experimental ]] ; then match="${file//\.experimental/}"