aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-01-11Merge tm-qpr-dev-plus-aosp-without-vendor@9467136temp_273316506_tm-qpr2Xin Li
Bug: 264720040 Merged-In: I5b1f7fdac0270c86807b4838cefb1e69f5e0ddff Change-Id: Ibe0a2af016b0c7e9e9935e190f3d8938e48b3871
2022-11-17[automerger skipped] Merge tag '1.6.4' into kotlinx.coroutines-upgrade am: ↵Steve Elliott
73b7fd0342 am: 4ac0c760bb -s ours am skip reason: Merged-In I5b1f7fdac0270c86807b4838cefb1e69f5e0ddff with SHA-1 ca095beaca is already in history Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2164368 Change-Id: Ie5695d903120b4f3e1b59fb515e8417f10e24689 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17Merge tag '1.6.4' into kotlinx.coroutines-upgrade am: 73b7fd0342main-16k-with-phonesSteve Elliott
Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2164368 Change-Id: Icbfbc2606571e50b5873edf282d44b18c218112b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-17Merge tag '1.6.4' into kotlinx.coroutines-upgradeSteve Elliott
Bug: 239834928 Change-Id: I5b1f7fdac0270c86807b4838cefb1e69f5e0ddff Merged-In: I5b1f7fdac0270c86807b4838cefb1e69f5e0ddff Test: manual -- all existing tests and builds should pass
2022-11-01Merge tag '1.6.4' into kotlinx.coroutines-upgrade am: ca095beacaSteve Elliott
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/19416732 Change-Id: I7bbdf6da762a3738aa0eee09812cee3d7d8b2669 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31[automerger skipped] Statically include kotlinx_coroutines into ↵Colin Cross
kotlinx_coroutines_android am: 70e65157e5 -s ours am skip reason: Merged-In I86cfd735d57b319b7dc362d8dd425cf8dff237d6 with SHA-1 f174609ee2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/20304651 Change-Id: I08efa839a001904e7e28425c638a5be40941a0bc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-31[automerger skipped] Update sdk_version of kotlinx-coroutines am: 4963ba0ae9 ↵Cole Faust
-s ours am skip reason: Merged-In Ie15d315a4396c539b5d3f8c903252c990c5274c7 with SHA-1 6ee49c7d05 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/20304649 Change-Id: I2b52d0829529337f73edbe314956906d54fa9d65 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28Merge tag '1.6.4' into kotlinx.coroutines-upgradeSteve Elliott
Bug: 239834928 Change-Id: I5b1f7fdac0270c86807b4838cefb1e69f5e0ddff Merged-In: I5b1f7fdac0270c86807b4838cefb1e69f5e0ddff Test: manual -- all existing tests and builds should pass
2022-10-28Statically include kotlinx_coroutines into kotlinx_coroutines_androidColin Cross
kotlinx_coroutines_android classes reference kotlinx_coroutines classes, and including kotlinx_coroutines_android without kotlinx_coroutines causes missing classes warnings in R8. Statically include kotlinx_coroutines into kotlinx_coroutines_android. Bug: 239834928 Bug: 247635736 Test: m CtsTranscodeTestAppSupportsHevc Change-Id: I86cfd735d57b319b7dc362d8dd425cf8dff237d6 Merged-In: I86cfd735d57b319b7dc362d8dd425cf8dff237d6
2022-10-28Update sdk_version of kotlinx-coroutinesCole Faust
So that it compiles for Jvm version 11, and doesn't hit issues inlining it's code into other Jvm 11 code. Bug: 239834928 Bug: 69160377 Bug: 236431222 Test: Treehugger Change-Id: Ie15d315a4396c539b5d3f8c903252c990c5274c7 Merged-In: Ie15d315a4396c539b5d3f8c903252c990c5274c7
2022-10-17[automerger skipped] Update arguments for kotlin 1.7.0 am: 53eee30fe7 -s oursColin Cross
am skip reason: Merged-In I516d54ed009cf2800781006afcb5f340f9d1e32d with SHA-1 614fe960d4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/20140393 Change-Id: I77b3a863a48ee112c4a0f83bc2c43b5049c98c94 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-07Update arguments for kotlin 1.7.0Colin Cross
Replace -Xuse-experimental with -opt-in. Bug: 216136346 Test: builds Change-Id: I516d54ed009cf2800781006afcb5f340f9d1e32d (cherry picked from commit 614fe960d4342c43869a56e207247e77eaa93a81) Merged-In: I516d54ed009cf2800781006afcb5f340f9d1e32d
2022-10-06Mark tm-qpr-dev-plus-aosp-without-vendor@9129937 as merged am: da257f8d2eXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/20130334 Change-Id: I46cfbe75e2e471220b3cd12470acb4066e191e40 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-06Mark tm-qpr-dev-plus-aosp-without-vendor@9129937 as mergedXin Li
Change-Id: I9127d99eae4efde3b7268de40d35f3b9c0662762
2022-10-05Merge "Update arguments for kotlin 1.7.0" am: 400ff95351 am: 65ad9a737a am: ↵Treehugger Robot
773b5b1596 am: 78ab32e1f2 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2134529 Change-Id: Ief73ffcf0eebff760b3c0ae622c4bc8acfe79b3e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05Merge "Update arguments for kotlin 1.7.0" am: 400ff95351 am: 65ad9a737a am: ↵Treehugger Robot
773b5b1596 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2134529 Change-Id: I2a06f98d68f93bd6fe984e1af7e865a51ad3fd55 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05Merge "Update arguments for kotlin 1.7.0" am: 400ff95351 am: 65ad9a737aTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2134529 Change-Id: I66852b913cf312b3dd522d400afced7246d56daa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05Merge "Update arguments for kotlin 1.7.0" am: 400ff95351Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2134529 Change-Id: I469cddcee5211d892bc8320bf2c1922ceb8340f9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05Merge "Update arguments for kotlin 1.7.0"Treehugger Robot
2022-09-26Statically include kotlinx_coroutines into kotlinx_coroutines_android am: ↵Colin Cross
f174609ee2 am: 001ee654a9 am: eedef2ebdd am: 6f482f2404 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2228537 Change-Id: I709f59fea3d1fe225cc3608602eee5a473d349cf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26Statically include kotlinx_coroutines into kotlinx_coroutines_android am: ↵Colin Cross
f174609ee2 am: 001ee654a9 am: eedef2ebdd Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2228537 Change-Id: I93fa9f38b037ed45482d1d5be6843647716f1b4f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26Statically include kotlinx_coroutines into kotlinx_coroutines_android am: ↵Colin Cross
f174609ee2 am: 001ee654a9 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2228537 Change-Id: Ifc83ee248a5f4b395e5262b18956efd76642705c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26Statically include kotlinx_coroutines into kotlinx_coroutines_android am: ↵Colin Cross
f174609ee2 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2228537 Change-Id: Ia0718f32fb63380e0e6e9c53af5384161abf7829 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-22Statically include kotlinx_coroutines into kotlinx_coroutines_androidColin Cross
kotlinx_coroutines_android classes reference kotlinx_coroutines classes, and including kotlinx_coroutines_android without kotlinx_coroutines causes missing classes warnings in R8. Statically include kotlinx_coroutines into kotlinx_coroutines_android. Bug: 247635736 Test: m CtsTranscodeTestAppSupportsHevc Change-Id: I86cfd735d57b319b7dc362d8dd425cf8dff237d6
2022-07-25Revert "Merge tag '1.6.4' into kotlinx.coroutines-upgrade" am: 7a8f34fdda ↵Nattharat Jariyanuntanaet
am: 7897509e87 am: 5746ab4999 am: af99ed0683 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2163825 Change-Id: I4c9e5075c5e8d2917a7084451941ab14538fa585 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-25Revert "Merge tag '1.6.4' into kotlinx.coroutines-upgrade" am: 7a8f34fdda ↵Nattharat Jariyanuntanaet
am: 7897509e87 am: 5746ab4999 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2163825 Change-Id: I4f1e6468e56ad0f73bb592b6edede2a679d66259 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-25Revert "Merge tag '1.6.4' into kotlinx.coroutines-upgrade" am: 7a8f34fdda ↵Nattharat Jariyanuntanaet
am: 7897509e87 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2163825 Change-Id: I731acccbcef92d9092a81d816befc7587bfc625f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-25Revert "Merge tag '1.6.4' into kotlinx.coroutines-upgrade" am: 7a8f34fddaNattharat Jariyanuntanaet
Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2163825 Change-Id: I14bb21a3ce41d9bfa3906500f2a69173194f110b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-25Revert "Merge tag '1.6.4' into kotlinx.coroutines-upgrade"Nattharat Jariyanuntanaet
This reverts commit ee8d57cebbcdd322d8fe58906322f7da59fc6b83. Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_stage-aosp-master&target=aosp_cf_x86_64_phone-userdebug&lkgb=8863416&lkbb=8865666&fkbb=8863523, bug 240001831 Bug: 240001831 Change-Id: I27fad3f510a429fdc336568e3eb6515d15e93b93
2022-07-23Merge tag '1.6.4' into kotlinx.coroutines-upgrade am: ee8d57cebb am: ↵Steve Elliott
48be5a6d8f am: 1653f31618 am: 2b5b8043b8 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2161436 Change-Id: Ib951561d83e5d43c9b9ad36a1aa0a7cffa67217a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-23Merge tag '1.6.4' into kotlinx.coroutines-upgrade am: ee8d57cebb am: ↵Steve Elliott
48be5a6d8f am: 1653f31618 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2161436 Change-Id: I95b9b2b0f854c63216866097ab3ed35be54dc804 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-23Merge tag '1.6.4' into kotlinx.coroutines-upgrade am: ee8d57cebb am: 48be5a6d8fSteve Elliott
Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2161436 Change-Id: Iab343a56f96a3dc30569a049dad4582bd2ad48a9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-23Merge tag '1.6.4' into kotlinx.coroutines-upgrade am: ee8d57cebbSteve Elliott
Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2161436 Change-Id: I5140e46777d6db53ffaf07863f0e4866eba47762 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22Merge tag '1.6.4' into kotlinx.coroutines-upgradeSteve Elliott
Test: manual -- all existing tests and builds should pass Change-Id: I35c30de604235e04bc80e0177de7cb6239f3aa7e
2022-07-12Version 1.6.4Dmitry Khalanskiy
2022-07-12Merge remote-tracking branch 'origin/master' into developDmitry Khalanskiy
2022-07-12Improve CoroutineDispatcher documentation (#3359)Vsevolod Tolstopyatov
Fixes #3354
2022-07-12Update binary compatibility validator to 0.11.0 (#3362)Vsevolod Tolstopyatov
2022-07-12Add a scope for launching background work in tests (#3348)dkhalanskyjb
Fixes https://github.com/Kotlin/kotlinx.coroutines/issues/3287
2022-07-11Fix debug module publication with shadow plugin (#3357)Vsevolod Tolstopyatov
Fixes #3345 Fixes #3334
2022-07-08Comply with Subscriber rule 2.7 in the `await*` impl (#3360)Yehor Kulbachka
There is a possibility of a race between Subscription.request and Subscription.cancel methods since cancellation handler could be executed in a separate thread. Rule [2.7](https://github.com/reactive-streams/reactive-streams-jvm/blob/v1.0.3/README.md#2-subscriber-code) requires Subscription methods to be executed serially.
2022-07-07Update sdk_version of kotlinx-coroutines am: 6ee49c7d05 am: cd0afc74f5 am: ↵Cole Faust
53c10c5b34 am: e0d110096b Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2139103 Change-Id: Ibfa313e048754bbc6dea53a4d499a615d0b1a4f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-07Update sdk_version of kotlinx-coroutines am: 6ee49c7d05 am: cd0afc74f5 am: ↵Cole Faust
53c10c5b34 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2139103 Change-Id: I34874c534a3c184f000580f3a858f23f0fe3af91 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-07Update sdk_version of kotlinx-coroutines am: 6ee49c7d05 am: cd0afc74f5Cole Faust
Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2139103 Change-Id: I198eb4084e4d9e3358836b36e1f735c50f1a5c8d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-07Update sdk_version of kotlinx-coroutines am: 6ee49c7d05Cole Faust
Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2139103 Change-Id: Ibf18a5a36b3a2ac4e2e89cd4990bd816189aaa78 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-04Update readme (#3343)Vsevolod Tolstopyatov
2022-07-01Update sdk_version of kotlinx-coroutinesCole Faust
So that it compiles for Jvm version 11, and doesn't hit issues inlining it's code into other Jvm 11 code. Bug: 69160377 Bug: 236431222 Test: Treehugger Change-Id: Ie15d315a4396c539b5d3f8c903252c990c5274c7
2022-06-30Reduce reachable references of disposed invokeOnTimeout handle (#3353)Vsevolod Tolstopyatov
* Reduce reachable references of disposed invokeOnTimeout handle Fixes #3351
2022-06-30Merge pull request #3342 from Kotlin/kotlinlang-apiKonstantin Chernenko
Docs: use kotlinlang.org for API
2022-06-29breakleg; knit validation fixzoobestik
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 12:29:57 +0000