aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-08-03Merge "Revert "Revert "Revert "Revert "Upgrade kotlinx.coroutines to ↵Colin Cross
1.7.2""""" into main
2023-07-28Add build target for kotlinx-coroutines-rx2 am: 1b8434ec7e am: 96e06ab900 ↵Alan Viverette
am: fc41894ef9 am: c6e2535e07 am: 14dfdedcc6 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2680260 Change-Id: I208e678847a3e8c7c72a8359ddc765ce976d9fc8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28Add build target for kotlinx-coroutines-rx2 am: 1b8434ec7e am: 96e06ab900 ↵Alan Viverette
am: fc41894ef9 am: c6e2535e07 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2680260 Change-Id: Ifdafa061d604545fe03b9c5f63d089f6f550adcf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28Revert "Revert "Revert "Revert "Upgrade kotlinx.coroutines to 1.7.2""""Colin Cross
This reverts commit e20e479cc32b15993171d05a2f3f500cd8c04991. Change-Id: I19037b8daf8b5e7fc4f717bb69f56809ffc945ab
2023-07-28Add build target for kotlinx-coroutines-rx2 am: 1b8434ec7e am: 96e06ab900 ↵Alan Viverette
am: fc41894ef9 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2680260 Change-Id: Ia6ec0263cb7b48b5923760d27a5aaf9f44325ba9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28Add build target for kotlinx-coroutines-rx2 am: 1b8434ec7e am: 96e06ab900Alan Viverette
Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2680260 Change-Id: I1434963be9522027227b97074c25d219aa327d82 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28Add build target for kotlinx-coroutines-rx2 am: 1b8434ec7eAlan Viverette
Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2680260 Change-Id: Id418a4bf1a843142a96e886e9ef208a3a0940857 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-28Add build target for kotlinx-coroutines-rx2Alan Viverette
Bug: 293507234 Change-Id: Ie2b000146a2004a393ab8bb851dfff9b3a317091 Test: m kotlinx-coroutines-rx2
2023-07-27Make kotlinx_coroutines_guava publicly visibleColin Cross
Test: builds Change-Id: Iafcdbbfb7c56102ec663df2d96dfb0766025e312 Merged-In: Iafcdbbfb7c56102ec663df2d96dfb0766025e312 (cherry picked from commit acf343dfb3c1817bf312db4fdd51c4beea7e83cf)
2023-07-27Reconcile Android.bp with AOSPColin Cross
The versions of I5b1f7fdac0270c86807b4838cefb1e69f5e0ddff that went into tm-qpr-dev and master were different. The tm-qpr-dev one has propagated to AOSP main, but everything else downstream is different. Cherry-pick the differences to reconcile them. Bug: 290933559 Test: builds Change-Id: I7556076a278bf3cf3626eb6093c1ee4fc7c04498 Merged-In: I7556076a278bf3cf3626eb6093c1ee4fc7c04498 (cherry picked from commit efd3fceb6fe6c83b791b038f032addde8a722b87)
2023-07-25Revert "Revert "Revert "Upgrade kotlinx.coroutines to 1.7.2""" am: ↵Colin Cross
e20e479cc3 am: 7306ecdb0b am: 00a43aee59 am: 075544c7cb am: 6a842a4c82 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2675316 Change-Id: I00e13c08db4d370c66a61eae137482f1ed0cab34 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25Revert "Revert "Revert "Upgrade kotlinx.coroutines to 1.7.2""" am: ↵Colin Cross
e20e479cc3 am: 7306ecdb0b am: 00a43aee59 am: 075544c7cb Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2675316 Change-Id: I75583eab5cf2b5d4cf012741f9f4a1b199599e73 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25Revert "Revert "Revert "Upgrade kotlinx.coroutines to 1.7.2""" am: ↵Colin Cross
e20e479cc3 am: 7306ecdb0b am: 00a43aee59 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2675316 Change-Id: Ibc84d35ae9bea89cc90c28a0f543eb88fb79e642 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25Revert "Revert "Revert "Upgrade kotlinx.coroutines to 1.7.2""" am: ↵Colin Cross
e20e479cc3 am: 7306ecdb0b Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2675316 Change-Id: I5ac0b1d093decbe81182a1649a75116caec6ac6d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25Revert "Revert "Revert "Upgrade kotlinx.coroutines to 1.7.2""" am: e20e479cc3Colin Cross
Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2675316 Change-Id: Ie22df1966388343f385edbeb104f866a9101afea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25Revert "Revert "Revert "Upgrade kotlinx.coroutines to 1.7.2"""Colin Cross
This reverts commit e4623ab71f5ce23ca9bef2033ad5241d16dfaac0. Reason for revert: b/292807808 Bug: 290933559 Bug: 292807808 Change-Id: I5b57da1c3762ac28952a4ba18d2fe530f7b04010
2023-07-25Revert "Revert "Upgrade kotlinx.coroutines to 1.7.2"" am: e4623ab71f am: ↵Colin Cross
e6d95df8d0 am: ddd2ce00a8 am: 3e17da7a0b am: 74deeb6899 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2666099 Change-Id: I0d4117d2cc5ff0338f030cecc6399901497763e9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25Revert "Revert "Upgrade kotlinx.coroutines to 1.7.2"" am: e4623ab71f am: ↵Colin Cross
e6d95df8d0 am: ddd2ce00a8 am: 3e17da7a0b Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2666099 Change-Id: I75119693b088ab7583ede863ac4b1486d3add77b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25Revert "Revert "Upgrade kotlinx.coroutines to 1.7.2"" am: e4623ab71f am: ↵Colin Cross
e6d95df8d0 am: ddd2ce00a8 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2666099 Change-Id: I20b8042746e061cb124cf61f9cfb58db575252a1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25Revert "Revert "Upgrade kotlinx.coroutines to 1.7.2"" am: e4623ab71f am: ↵Colin Cross
e6d95df8d0 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2666099 Change-Id: I06f666ca0df8d6a80520fa0b2f7a3d3e8a16901a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25Revert "Revert "Upgrade kotlinx.coroutines to 1.7.2"" am: e4623ab71fColin Cross
Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2666099 Change-Id: I0356cc88f5ce136c6f57b5e15a0b3bfd98865f2e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19Revert "Revert "Upgrade kotlinx.coroutines to 1.7.2""Colin Cross
This reverts commit 50152079bc0ae35465bab3fa5eb2d403ffb664b0. Reason for revert: test failures fixed by aosp/2663338 Bug: 290933559 Bug: 291780006 Change-Id: I43aa20b8fc5cb44f21e2e10724aa9a31ca0554eb
2023-07-19Revert "Upgrade kotlinx.coroutines to 1.7.2" am: 50152079bc am: 37de6aa219 ↵Colin Cross
am: ebf4254fd0 am: 1bb602f9ab am: e534f92d93 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2663695 Change-Id: Ia3f74f7fbf02a4740c22c00b84a5438278c752c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19Revert "Upgrade kotlinx.coroutines to 1.7.2" am: 50152079bc am: 37de6aa219 ↵Colin Cross
am: ebf4254fd0 am: 1bb602f9ab Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2663695 Change-Id: I1d13aa19f75e8d3536f9c821e88ad3a821946b1a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Revert "Upgrade kotlinx.coroutines to 1.7.2" am: 50152079bc am: 37de6aa219 ↵Colin Cross
am: ebf4254fd0 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2663695 Change-Id: Ia176e3ad9c07e55d569468d3741d621131c1a792 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Revert "Upgrade kotlinx.coroutines to 1.7.2" am: 50152079bc am: 37de6aa219Colin Cross
Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2663695 Change-Id: I7018b2d3e9d71cc4dc01a3dbfc4da971fd22b969 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Revert "Upgrade kotlinx.coroutines to 1.7.2" am: 50152079bcColin Cross
Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2663695 Change-Id: I7b77b41895ab571b398d03056af9ec24efc7daba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Upgrade kotlinx.coroutines to 1.7.2 am: eb6457f190 am: c8220372fa am: ↵Colin Cross
a60f512eff am: e614861343 am: 739f07a66e Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2655585 Change-Id: Ibce5852e829f4f66066bd49a49427f858e61f204 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Revert "Upgrade kotlinx.coroutines to 1.7.2"Colin Cross
This reverts commit eb6457f1902063f1cc7e5b9993208147ad28af73. Reason for revert: b/291781857, b/291792390, b/291793124 Change-Id: I1386fe14240d69c078dbf7e4796d5b5b541ed588
2023-07-18Upgrade kotlinx.coroutines to 1.7.2 am: eb6457f190 am: c8220372fa am: ↵Colin Cross
a60f512eff am: e614861343 Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2655585 Change-Id: I56269f7a7eb0b50c5e34ade7cd8051e7ee431b68 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Upgrade kotlinx.coroutines to 1.7.2 am: eb6457f190 am: c8220372fa am: a60f512effColin Cross
Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2655585 Change-Id: I58d1e598a47bb6ea6fd2c917626665001d882d14 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Upgrade kotlinx.coroutines to 1.7.2 am: eb6457f190 am: c8220372faColin Cross
Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2655585 Change-Id: I322839eb0c44afbf546e6044bb814a816d9d5cfd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Upgrade kotlinx.coroutines to 1.7.2 am: eb6457f190Colin Cross
Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2655585 Change-Id: I8838d4374242deb4e66d96802af0883ec4cd1e8a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13Reconcile Android.bp with AOSP am: efd3fceb6f am: 2382775e57 am: 92c7cfffb0Colin Cross
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/24044163 Change-Id: I944a0874156f07e3305059564d0d3614bf5a8e58 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12Reconcile Android.bp with AOSP am: efd3fceb6f am: 2382775e57Colin Cross
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/24044163 Change-Id: I5ab947a900f83d23269e21dbdce3ea5e8512db0c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12Reconcile Android.bp with AOSP am: efd3fceb6fColin Cross
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/24044163 Change-Id: I8203c6968a8ae9f61b8a28cabb82726b3bf8fc64 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12Reconcile Android.bp with AOSPColin Cross
The versions of I5b1f7fdac0270c86807b4838cefb1e69f5e0ddff that went into tm-qpr-dev and master were different. The tm-qpr-dev one has propagated to AOSP main, but everything else downstream is different. Cherry-pick the differences to reconcile them. Bug: 290933559 Test: builds Change-Id: I7556076a278bf3cf3626eb6093c1ee4fc7c04498
2023-07-12Upgrade kotlinx.coroutines to 1.7.2Colin Cross
This project was upgraded with external_updater. Usage: tools/external_updater/updater.sh update kotlinx.coroutines For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md Bug: 290933559 Test: TreeHugger Change-Id: Ieb7d1a8e4de01915ce471dcf014f7778e4e00d61
2023-06-29Merge pull request #3797 from Kotlin/version-1.7.2Vsevolod Tolstopyatov
Version 1.7.2
2023-06-29Version 1.7.2Vsevolod Tolstopyatov
2023-06-29Fix newSingleThreadContext awaiting cancelled scheduled coroutines (#3769)Dmitry Khalanskiy
* Fix newSingleThreadContext awaiting cancelled scheduled coroutines Before the change, the Worker is not notified about its work being cancelled, due to no API being present for that. We work around the issue by checking every 100 milliseconds whether cancellation happened. Also, alias 'newSingleThreadContext' to 'newFixedThreadPoolContext(1)` for the sake of consistent implementation Fixes #3768
2023-06-29Merge branch 'master' into developVsevolod Tolstopyatov
2023-06-28Snap for 10399941 from 88fde44b0bdc8179dc5daf8152e967b0783ca0e9 to sdk-releaseplatform-tools-34.0.4Android Build Coastguard Worker
Change-Id: I070acf04fdfafa4ad623dee5a7381d1375251bb6
2023-06-28Do not track coroutines with empty coroutine context in DebugProbes (#3784)Vsevolod Tolstopyatov
Such coroutines typically are a subject for significant debugger overhead, can be observed with more conventional tools, and do not contribute to the state of the system that is typically observed with coroutines debugger Fixes #3782 Co-authored-by: Oleg Yukhnevich <whyoleg@gmail.com> Co-authored-by: Dmitry Khalanskiy <52952525+dkhalanskyjb@users.noreply.github.com>
2023-06-28Formalize the internal IDEA dependencies for binary compatibility (#3746)Dmitry Khalanskiy
Using the list in the issue KTIJ-24102.
2023-06-27[automerger skipped] Merge Android 13 QPR3 am: 88fde44b0b -s ours am: ↵Xin Li
bb1bd46e76 -s ours am: f0c010504c -s ours am: a2523f395c -s ours am: bf4e51def3 -s ours am: 4763f6689d -s ours am skip reason: Merged-In I1323d4e2de40430cc59e95993d2b32f916d042c2 with SHA-1 18454a4ec9 is already in history Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2635232 Change-Id: I18e22561e6224403388d9bf101858dea20b1a77c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27[automerger skipped] Merge Android 13 QPR3 am: 88fde44b0b -s ours am: ↵Xin Li
bb1bd46e76 -s ours am: f0c010504c -s ours am: a2523f395c -s ours am: bf4e51def3 -s ours am skip reason: Merged-In I1323d4e2de40430cc59e95993d2b32f916d042c2 with SHA-1 18454a4ec9 is already in history Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2635232 Change-Id: I2debd1169042c7f8b21d93c2c0623b09d08b3670 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27[automerger skipped] Merge Android 13 QPR3 am: 88fde44b0b -s ours am: ↵Xin Li
bb1bd46e76 -s ours am: f0c010504c -s ours am: a2523f395c -s ours am skip reason: Merged-In I1323d4e2de40430cc59e95993d2b32f916d042c2 with SHA-1 18454a4ec9 is already in history Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2635232 Change-Id: Ifb1ec2bf1f56551c79155d6f2f428518e406d46c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27[automerger skipped] Merge Android 13 QPR3 am: 88fde44b0b -s ours am: ↵Xin Li
bb1bd46e76 -s ours am: f0c010504c -s ours am skip reason: Merged-In I1323d4e2de40430cc59e95993d2b32f916d042c2 with SHA-1 18454a4ec9 is already in history Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2635232 Change-Id: I012e550834a1d28334bda9e5dd7a494a120f0d62 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26[automerger skipped] Merge Android 13 QPR3 am: 88fde44b0b -s ours am: ↵Xin Li
bb1bd46e76 -s ours am skip reason: Merged-In I1323d4e2de40430cc59e95993d2b32f916d042c2 with SHA-1 18454a4ec9 is already in history Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.coroutines/+/2635232 Change-Id: I8ce63108c79ea0ffb1dbebd9f44671001ef60a56 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 01:05:15 +0000