Skip to content

Commit f19ae19

Browse files
authored
Post-release cleanup (#2562)
* Properly handle files with spaces in deploy.sh * Update version shield * Changelog typos
1 parent b7e08b8 commit f19ae19

File tree

5 files changed

+10
-6
lines changed

5 files changed

+10
-6
lines changed

CHANGES.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@
2020

2121
* Fixed the problem that prevented implementation via delegation for `Job` interface (#2423)
2222
* Fixed incorrect ProGuard rules that allowed shrinking volatile felds (#1564)
23-
* Fixed `await/`asDeferred` for `MinimalState` implementations in jdk8 module (#2456)
23+
* Fixed `await`/`asDeferred` for `MinimalStage` implementations in jdk8 module (#2456)
2424
* Fixed bug when `onUndeliveredElement` wasn't called for unlimited channels (#2435)
2525
* Fixed a bug when `ListenableFuture.isCancelled` returned from `asListenableFuture` could have thrown an exception, thanks to @vadimsemenov (#2421)
2626
* Coroutine in `callbackFlow` and `produce` is properly cancelled when the channel was closed separately (#2506)
2727

28-
2928
## Version 1.4.2
3029

3130
* Fixed `StackOverflowError` in `Job.toString` when `Job` is observed in its intermediate state (#2371).

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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)
5-
[![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)
5+
[![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)
66
[![Kotlin](https://img.shields.io/badge/kotlin-1.4.30-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

RELEASE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ To release new `<version>` of `kotlinx-coroutines`:
3434
7. Commit updated files to a new version branch:<br>
3535
`git commit -a -m "Version <version>"`
3636

37-
8. Push new version into the branch:<br>
37+
8. Push the new version into the branch:<br>
3838
`git push -u origin version-<version>`
3939

4040
9. Create Pull-Request on GitHub from `version-<version>` branch into `master`:

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jekyll_version=4.0
5555
org.gradle.jvmargs=-Xmx2g
5656

5757
# Workaround for Bintray treating .sha512 files as artifacts
58-
# https://github.com/gradle/gradle/issues/1.4.3
58+
# https://github.com/gradle/gradle/issues/11412
5959
systemProp.org.gradle.internal.publish.checksums.insecure=true
6060

6161
# todo:KLUDGE: This is commented out, and the property is set conditionally in build.gradle, because IDEA doesn't work with it.

site/deploy.sh

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
#!/usr/bin/env bash
22

3+
#
4+
# Copyright 2016-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
5+
#
6+
37
# Abort on first error
48
set -e
59

@@ -47,7 +51,8 @@ git rm `find . -type f -not -name '*.html' -not -name '.git'` > /dev/null
4751
echo "Redirecting experimental pages"
4852
git_add=()
4953
git_rm=()
50-
for file in `find . -type f -name '*.html'` ; do
54+
`find . -type f -name '*.html'` | while read file
55+
do
5156
match=nothing_is_found
5257
if [[ $file =~ \.experimental ]] ; then
5358
match="${file//\.experimental/}"

0 commit comments

Comments
 (0)