Skip to content

Commit cefe9b0

Browse files
committed
IntelliJ patches base
1 parent ee92d16 commit cefe9b0

File tree

4 files changed

+36
-2
lines changed

4 files changed

+36
-2
lines changed

IntelliJ-patches.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Included IntelliJ-related patches
2+
- TODO

README.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1-
# kotlinx.coroutines
1+
# kotlinx.coroutines with IntelliJ patches
2+
3+
This repository is a fork of the original [kotlinx.coroutines](https://github.com/Kotlin/kotlinx.coroutines) library that includes
4+
several patches (see [IntelliJ-patches.md](IntelliJ-patches.md)).
5+
6+
**Important:**
7+
- Only JVM build target is fully supported and used
8+
9+
Release instructions are [here](RELEASE.md).
10+
11+
---
212

313
[![Kotlin Stable](https://kotl.in/badges/stable.svg)](https://kotlinlang.org/docs/components-stability.html)
414
[![JetBrains official project](https://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)

RELEASE.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
# com.intellij.platform:kotlinx-coroutines-* release
2+
3+
```
4+
# update branches
5+
# git remote add upstream https://github.com/Kotlin/kotlinx.coroutines.git
6+
git checkout master
7+
git fetch upstream
8+
git fetch origin
9+
10+
# prepare new master with patches
11+
git reset --hard upstream/master
12+
git rebase intellij/patch-base
13+
git rebase intellij/whatever-patches-we-have, see IntelliJ-patches.md for the list of branches
14+
15+
# Remember to change the version in `gradle.properties` to something like `1.8.4-intellij-SNAPSHOT`
16+
# commit version change
17+
18+
git push origin master --force
19+
```
20+
21+
---
22+
123
# kotlinx.coroutines release checklist
224

325
To release a new `<version>` of `kotlinx-coroutines`:

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Kotlin
22
version=1.10.1-SNAPSHOT
3-
group=org.jetbrains.kotlinx
3+
group=com.intellij.platform
44
kotlin_version=2.1.0
55
kotlin_language_version=2.1
66
# DO NOT rename this property without adapting kotlinx.train build chain:

0 commit comments

Comments
 (0)