aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 67707de75a -s ↵HEADandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29mastermainandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseXin Li
ours am: b6d73103c1 -s ours am: 87a5ac6d5d -s ours am: db33ff2a48 -s ours am skip reason: Merged-In I59516fc3b0d16518e517b81b0179a978f30c0db6 with SHA-1 142a2141b8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ktfmt/+/24087350 Change-Id: If95e654fbd3cf7b92ef11319cc9ad360cff54384 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 67707de75a -s ↵Xin Li
ours am: b6d73103c1 -s ours am: 87a5ac6d5d -s ours am skip reason: Merged-In I59516fc3b0d16518e517b81b0179a978f30c0db6 with SHA-1 142a2141b8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ktfmt/+/24087350 Change-Id: Ib7dc5b1e196fbc466e3d97ee43e4867d09ebdcbf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 67707de75a -s ↵Xin Li
ours am: b6d73103c1 -s ours am skip reason: Merged-In I59516fc3b0d16518e517b81b0179a978f30c0db6 with SHA-1 142a2141b8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ktfmt/+/24087350 Change-Id: I82d7697a3aaa209e4a29b0f4b5b4e1cd4a578fe7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 67707de75a -s oursXin Li
am skip reason: Merged-In I59516fc3b0d16518e517b81b0179a978f30c0db6 with SHA-1 142a2141b8 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ktfmt/+/24087350 Change-Id: I0d42699a0741d78e0aab0144e5870931ecad6217 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14Empty Merge Android U (ab/10368041)Xin Li
Bug: 291102124 Merged-In: I59516fc3b0d16518e517b81b0179a978f30c0db6 Change-Id: Ibbcacb59cb65fab79f21aa6dee70189c2a386506
2023-06-27[automerger skipped] Merge Android 13 QPR3 am: a252ba3f97 -s ours am: ↵Xin Li
e84b1d7280 -s ours am: 1e57ae42a5 -s ours am: 1b83607f69 -s ours am: 819361d7c6 -s ours am: 54bee00421 -s ours am skip reason: Merged-In I39f708d033ff9bf9f99d1943b0cacfdf65b58972 with SHA-1 fd9d2867cd is already in history Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2634992 Change-Id: I62a29c3770bcbf33c36fadc65880a4c9b45a4c11 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27[automerger skipped] Merge Android 13 QPR3 am: a252ba3f97 -s ours am: ↵Xin Li
e84b1d7280 -s ours am: 1e57ae42a5 -s ours am: 1b83607f69 -s ours am: 819361d7c6 -s ours am skip reason: Merged-In I39f708d033ff9bf9f99d1943b0cacfdf65b58972 with SHA-1 fd9d2867cd is already in history Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2634992 Change-Id: Idc3d2753e5bf81f31dc3548b0b79a30f84f3d338 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27[automerger skipped] Merge Android 13 QPR3 am: a252ba3f97 -s ours am: ↵Xin Li
e84b1d7280 -s ours am: 1e57ae42a5 -s ours am: 1b83607f69 -s ours am skip reason: Merged-In I39f708d033ff9bf9f99d1943b0cacfdf65b58972 with SHA-1 fd9d2867cd is already in history Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2634992 Change-Id: If168f634eebfac4bae027c6ebe4193197b743b07 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27[automerger skipped] Merge Android 13 QPR3 am: a252ba3f97 -s ours am: ↵Xin Li
e84b1d7280 -s ours am: 1e57ae42a5 -s ours am skip reason: Merged-In I39f708d033ff9bf9f99d1943b0cacfdf65b58972 with SHA-1 fd9d2867cd is already in history Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2634992 Change-Id: I57382394b03188dc0fcaef9e1571294f5ce6614d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26[automerger skipped] Merge Android 13 QPR3 am: a252ba3f97 -s ours am: ↵Xin Li
e84b1d7280 -s ours am skip reason: Merged-In I39f708d033ff9bf9f99d1943b0cacfdf65b58972 with SHA-1 fd9d2867cd is already in history Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2634992 Change-Id: I479cf878c500ea9ba29cecb39cdeacf807d6f96f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26[automerger skipped] Merge Android 13 QPR3 am: a252ba3f97 -s oursXin Li
am skip reason: Merged-In I39f708d033ff9bf9f99d1943b0cacfdf65b58972 with SHA-1 fd9d2867cd is already in history Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2634992 Change-Id: I4ea32e66bd2d44afa06878011629a3ed1d6de2f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21Merge Android 13 QPR3Xin Li
Bug: 275386652 Merged-In: I39f708d033ff9bf9f99d1943b0cacfdf65b58972 Change-Id: I0a0e42cf96f088c03cbfdc5abd937c09cb50b06c
2023-04-21[automerger skipped] Merge Android 13 QPR3 ↵Xin Li
tm-qpr-dev-plus-aosp-without-vendor@9936994 am: fd9d2867cd -s ours am: 59d5d19e4f -s ours am: 142a2141b8 -s ours am: 85bef96f06 -s ours am skip reason: Merged-In I8bc7ef777e5d6263b868778a8720688e563a2c2b with SHA-1 3ac28026c1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ktfmt/+/22722280 Change-Id: I266a82ff974e4c116f50e509753315312eace9df Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21[automerger skipped] Merge Android 13 QPR3 ↵Xin Li
tm-qpr-dev-plus-aosp-without-vendor@9936994 am: fd9d2867cd -s ours am: 59d5d19e4f -s ours am: 142a2141b8 -s ours am skip reason: Merged-In I8bc7ef777e5d6263b868778a8720688e563a2c2b with SHA-1 3ac28026c1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ktfmt/+/22722280 Change-Id: Ie8809dbb53e3d6d910f457d21d0339cb182dc668 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21[automerger skipped] Merge Android 13 QPR3 ↵Xin Li
tm-qpr-dev-plus-aosp-without-vendor@9936994 am: fd9d2867cd -s ours am: 59d5d19e4f -s ours am skip reason: Merged-In I8bc7ef777e5d6263b868778a8720688e563a2c2b with SHA-1 3ac28026c1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ktfmt/+/22722280 Change-Id: I59516fc3b0d16518e517b81b0179a978f30c0db6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21[automerger skipped] Merge Android 13 QPR3 ↵Xin Li
tm-qpr-dev-plus-aosp-without-vendor@9936994 am: fd9d2867cd -s ours am skip reason: Merged-In I8bc7ef777e5d6263b868778a8720688e563a2c2b with SHA-1 3ac28026c1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ktfmt/+/22722280 Change-Id: I8ff738b83a00bdc1e1c5100f2dee7373ac0f3ba2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-18Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994temp_275386652Xin Li
Bug: 275386652 Merged-In: I8bc7ef777e5d6263b868778a8720688e563a2c2b Change-Id: I39f708d033ff9bf9f99d1943b0cacfdf65b58972
2023-03-15Merge "[automerger skipped] Merge Android 13 QPR2 am: 2d6ada7f40 -s ours am: ↵Automerger Merge Worker
bcf17e9ff2 -s ours am: 922e950b48 -s ours am: e6b742b1cb -s ours am: b1c1506fe9 -s ours"
2023-03-15[automerger skipped] Merge Android 13 QPR2 am: 2d6ada7f40 -s ours am: ↵Xin Li
bcf17e9ff2 -s ours am: 922e950b48 -s ours am: e6b742b1cb -s ours am: b1c1506fe9 -s ours am skip reason: Merged-In Ibc337e4459d8db789f0b2102b71a8b2e1ed2589f with SHA-1 bdb0b8d3fa is already in history Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2487155 Change-Id: I359abcd19b138f89317a9ee8a6e9343e1ed5fd1d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15[automerger skipped] Merge Android 13 QPR2 am: 2d6ada7f40 -s ours am: ↵Xin Li
bcf17e9ff2 -s ours am: 922e950b48 -s ours am: e6b742b1cb -s ours am: 5b18221949 -s ours am skip reason: Merged-In Ibc337e4459d8db789f0b2102b71a8b2e1ed2589f with SHA-1 bdb0b8d3fa is already in history Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2487155 Change-Id: I49ee87d4bcb5026607b67e46f0428cbdb249ff7b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15[automerger skipped] Merge Android 13 QPR2 am: 2d6ada7f40 -s ours am: ↵android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseXin Li
bcf17e9ff2 -s ours am: 922e950b48 -s ours am: e6b742b1cb -s ours am skip reason: Merged-In Ibc337e4459d8db789f0b2102b71a8b2e1ed2589f with SHA-1 bdb0b8d3fa is already in history Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2487155 Change-Id: I990c2bb291cae37134e91ff7fecc9b45e2711409 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15[automerger skipped] Merge Android 13 QPR2 am: 2d6ada7f40 -s ours am: ↵aml_wif_341711020aml_wif_341610000aml_wif_341510000aml_wif_341410080aml_wif_341310010aml_wif_341110010aml_wif_341011010aml_wif_340913010aml_uwb_341710010aml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000aml_tet_341712060aml_tet_341610020aml_tet_341511010aml_tet_341411060aml_tet_341310230aml_tet_341112070aml_tet_341010040aml_tet_340913030aml_swc_341711000aml_swc_341619000aml_swc_341513600aml_swc_341312300aml_swc_341312020aml_swc_341111000aml_swc_341011020aml_swc_340922010aml_sta_341710000aml_sta_341615000aml_sta_341511040aml_sta_341410000aml_sta_341311010aml_sta_341114000aml_sta_341111000aml_sta_341010020aml_sta_340912000aml_sta_340911000aml_sdk_341710000aml_sdk_341510000aml_sdk_341410000aml_sdk_341110080aml_sdk_341110000aml_sdk_341010000aml_sdk_340912010aml_sch_341510000aml_res_341510000aml_res_341410010aml_res_341311030aml_res_341110000aml_res_340912000aml_per_341711000aml_per_341614000aml_per_341510010aml_per_341410020aml_per_341311000aml_per_341110020aml_per_341110010aml_per_341011100aml_per_341011020aml_per_340916010aml_odp_341717000aml_odp_341610000aml_neu_341510000aml_neu_341010080aml_neu_341010000aml_net_341710020aml_net_341610030aml_net_341510050aml_net_341510000aml_net_341411030aml_net_341311010aml_net_341310020aml_net_341111030aml_net_341014000aml_net_340913000aml_mpr_341713020aml_mpr_341614010aml_mpr_341511070aml_mpr_341411070aml_mpr_341313030aml_mpr_341111030aml_mpr_341111020aml_mpr_341015090aml_mpr_341015030aml_mpr_340919000aml_med_341711000aml_med_341619000aml_med_341513600aml_med_341312300aml_med_341312020aml_med_341111000aml_med_341011000aml_med_340922010aml_ips_341611000aml_ips_341510000aml_ips_340914280aml_ips_340914200aml_ips_340914000aml_ext_341716000aml_ext_341620040aml_ext_341518010aml_ext_341414010aml_ext_341317010aml_ext_341131030aml_ext_341027030aml_doc_341713000aml_doc_341610010aml_doc_341510050aml_doc_341312010aml_doc_341112000aml_doc_341012000aml_doc_340916000aml_con_341614000aml_con_341511080aml_con_341410300aml_con_341310090aml_con_341110000aml_cbr_341710000aml_cbr_341610000aml_cbr_341510010aml_cbr_341410010aml_cbr_341311010aml_cbr_341110000aml_cbr_341011000aml_cbr_340914000aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000aml_art_341711000aml_art_341615020aml_art_341514450aml_art_341514410aml_art_341411300aml_art_341311100aml_art_341110110aml_art_341110060aml_art_341010050aml_art_340915060aml_ads_341720000aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_adb_341520010aml_adb_341517070aml_adb_340912530aml_adb_340912350aml_adb_340912200aml_adb_340912000android14-mainline-wifi-releaseandroid14-mainline-uwb-releaseandroid14-mainline-tethering-releaseandroid14-mainline-sdkext-releaseandroid14-mainline-resolv-releaseandroid14-mainline-permission-releaseandroid14-mainline-os-statsd-releaseandroid14-mainline-networking-releaseandroid14-mainline-mediaprovider-releaseandroid14-mainline-media-swcodec-releaseandroid14-mainline-media-releaseandroid14-mainline-extservices-releaseandroid14-mainline-conscrypt-releaseandroid14-mainline-cellbroadcast-releaseandroid14-mainline-art-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseandroid14-mainline-adbd-releaseXin Li
bcf17e9ff2 -s ours am: 922e950b48 -s ours am: e6b742b1cb -s ours am skip reason: Merged-In Ibc337e4459d8db789f0b2102b71a8b2e1ed2589f with SHA-1 bdb0b8d3fa is already in history Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2487155 Change-Id: I4f3e3d7834e560a44cab43d16e687da701e200d6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15[automerger skipped] Merge Android 13 QPR2 am: 2d6ada7f40 -s ours am: ↵android14-devXin Li
bcf17e9ff2 -s ours am: 922e950b48 -s ours am skip reason: Merged-In Ibc337e4459d8db789f0b2102b71a8b2e1ed2589f with SHA-1 bdb0b8d3fa is already in history Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2487155 Change-Id: I428c36db6f1a04afb3205b1c67b47130bfe32ccb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14[automerger skipped] Merge Android 13 QPR2 am: 2d6ada7f40 -s ours am: ↵Xin Li
bcf17e9ff2 -s ours am skip reason: Merged-In Ibc337e4459d8db789f0b2102b71a8b2e1ed2589f with SHA-1 bdb0b8d3fa is already in history Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2487155 Change-Id: I12462ee7fe4f8d5eef2a98fab497cbadad7b98f6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14[automerger skipped] Merge Android 13 QPR2 am: 2d6ada7f40 -s oursXin Li
am skip reason: Merged-In Ibc337e4459d8db789f0b2102b71a8b2e1ed2589f with SHA-1 bdb0b8d3fa is already in history Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2487155 Change-Id: Ib6ac6f26ea9e001b3d9c18a99c79ae8747b1a468 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13Merge Android 13 QPR2android-u-beta-1-gplXin Li
Bug: 273316506 Merged-In: Ibc337e4459d8db789f0b2102b71a8b2e1ed2589f Change-Id: I1194cf6d5efb45e7c6aa69aa1234ebc599be32c6
2023-03-01Add ktfmt 0.43 prebuilt am: 3ac28026c1 am: 9f8a7e3171 am: 050926c89c am: ↵Jordan Demeulenaere
94aaa6a481 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ktfmt/+/21609853 Change-Id: Idd6c0e27a358d95eb8daea441a17b23d9791ca37 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01Add ktfmt 0.43 prebuilt am: 3ac28026c1 am: 9f8a7e3171 am: 050926c89c am: ↵Jordan Demeulenaere
7c0a694be2 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ktfmt/+/21609853 Change-Id: I2676540ee461792e66a822b8053c1dfdb15c4457 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01Add ktfmt 0.43 prebuilt am: 3ac28026c1 am: 9f8a7e3171 am: 050926c89cJordan Demeulenaere
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ktfmt/+/21609853 Change-Id: I6827bffe9c38aa14e93fbfc568aeed27a16d99ea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01Add ktfmt 0.43 prebuilt am: 3ac28026c1 am: 9f8a7e3171 am: 050926c89cJordan Demeulenaere
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ktfmt/+/21609853 Change-Id: I0dc87512bef4a6e381559e0ca13cd75c76f79c35 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01Add ktfmt 0.43 prebuilt am: 3ac28026c1 am: 9f8a7e3171Jordan Demeulenaere
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ktfmt/+/21609853 Change-Id: I29a626826342506367ac006169043aa19933e569 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01Add ktfmt 0.43 prebuilt am: 3ac28026c1Jordan Demeulenaere
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ktfmt/+/21609853 Change-Id: I7c99c898ad581d640c5be689bb431961732973d5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01Add ktfmt 0.43 prebuiltandroid-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseJordan Demeulenaere
This CL adds the prebuilt of ktfmt 0.43 to external/ktfmt/ and uses it when formatting Kotlin files. This prebuilts was picked from http://ab/9645412 and will be the same as the one built in http://aosp/2455068. See b/266197805#comment6 for details on why this prebuilt is checked-in outside of the prebuilts/build-tools/ folder. Bug: 266197805 Test: Manual Change-Id: I8bc7ef777e5d6263b868778a8720688e563a2c2b Merged-In: I473f48c9785585c8ce7263a7a47869bc61c0c953
2023-02-24Merge tag 'v0.43' into aosp/master am: 732c9702b2 am: c431a78e6c am: ↵Jordan Demeulenaere
a9fa90b3c3 am: d18317dd3a am: 03496335f3 Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2453026 Change-Id: Ic6f078ac6017e58ba0ecfcb7023f96ced20d5251 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24Revert "Revert "Merge tag 'v0.42' into update"" am: 582c58a7a2 am: ↵Jordan Demeulenaere
8c6e055aaf am: f2ef27b6a0 am: b7dd8bffc6 am: 457d4958db Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2453025 Change-Id: I6461ba98e5f230ba9e123f8048f3a50922872628 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24Merge tag 'v0.43' into aosp/master am: 732c9702b2 am: c431a78e6c am: ↵Jordan Demeulenaere
a9fa90b3c3 am: d18317dd3a Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2453026 Change-Id: I29e8b14fde3ed823876e488486e20b71f5db482e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24Revert "Revert "Merge tag 'v0.42' into update"" am: 582c58a7a2 am: ↵Jordan Demeulenaere
8c6e055aaf am: f2ef27b6a0 am: b7dd8bffc6 Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2453025 Change-Id: Id4eb2812c770e64d1259a104f2c205f23694e45b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23Merge tag 'v0.43' into aosp/master am: 732c9702b2 am: c431a78e6c am: ↵Jordan Demeulenaere
a9fa90b3c3 am: d18317dd3a Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2453026 Change-Id: I990e97c677bcb7327da1f9b79bc258288a2119fb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23Revert "Revert "Merge tag 'v0.42' into update"" am: 582c58a7a2 am: ↵Jordan Demeulenaere
8c6e055aaf am: f2ef27b6a0 am: b7dd8bffc6 Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2453025 Change-Id: I6538cfb83f53ebef9da64deff4b0789c41db7690 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23Merge tag 'v0.43' into aosp/master am: 732c9702b2 am: c431a78e6c am: a9fa90b3c3Jordan Demeulenaere
Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2453026 Change-Id: Ic6212abb4535be8182a3e7d523ab8804b1e6f0df Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23Revert "Revert "Merge tag 'v0.42' into update"" am: 582c58a7a2 am: ↵Jordan Demeulenaere
8c6e055aaf am: f2ef27b6a0 Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2453025 Change-Id: I65750888237178a940a16424c87f47cc0e1425c0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23Merge tag 'v0.43' into aosp/master am: 732c9702b2 am: c431a78e6cJordan Demeulenaere
Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2453026 Change-Id: I2249c74960adb718a8520bd4b0dd52b06163f8f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23Revert "Revert "Merge tag 'v0.42' into update"" am: 582c58a7a2 am: 8c6e055aafJordan Demeulenaere
Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2453025 Change-Id: Ie659886795e7779f06b69b44b11d38bf495bb782 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23Merge tag 'v0.43' into aosp/master am: 732c9702b2temp_273316506_tm-qpr2Jordan Demeulenaere
Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2453026 Change-Id: I2bac2bb3c600ed8056e4420558a6c008cdeb678c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23Revert "Revert "Merge tag 'v0.42' into update"" am: 582c58a7a2Jordan Demeulenaere
Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2453025 Change-Id: I7689746fe3ee6f5aa9783b8b73c06e0d0ba77c06 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23Merge tag 'v0.43' into aosp/masterJordan Demeulenaere
This CL updates the source of ktfmt to the latest release v0.43. This CL was created using: $ git fetch --all --tags $ git merge --no-ff --allow-unrelated-histories v0.43 * tag 'v0.43': Bump version to 0.43 Fix indentation of initializer-like expressions with leading comments (#382) Create FenceCommentsOp and use it to simplify some confusing comment handling situations (#381) Eliminate mis-paired OpsBuilder.open()/close() (#379) Bump decode-uri-component from 0.2.0 to 0.2.2 in /website (#369) Updated maven-jar-plugin and maven-assembly-plugin from version 2.6 to 3.3.0 (#363) De-inline OpsBuilder.block() (#378) Miscellaneous fixes to the KDoc formatter (#372) Update website copyright statement Support disabling import optimization from command line Daily `arc lint --take KTFMT` Bump minimatch from 3.0.4 to 3.1.2 in /website (#370) Bump qs from 6.5.2 to 6.5.3 in /website (#371) Bump version to 0.43-SNAPSHOT Test: m ktfmt Bug: 266197805 Change-Id: If4769d9bad1a2ae07c41cbcf0944fbfedcb4bed1
2023-02-23Revert "Revert "Merge tag 'v0.42' into update""Jordan Demeulenaere
This reverts commit 0c522a74a45613a7831f8abf423e83a38d409886. Test: m ktfmt Bug: 266197805 Change-Id: I87b9b9b9e70acabfd4a26a628cb8f7cf5a1f956e
2023-02-09Replace prepare_upgrade.sh by a Python equivalent am: a56945eb52 am: ad7515c1ccJordan Demeulenaere
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ktfmt/+/21147693 Change-Id: Ic2c84d5b12a2e98f7d181a236573ca26c5d34615 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09Replace prepare_upgrade.sh by a Python equivalent am: a56945eb52Jordan Demeulenaere
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ktfmt/+/21147693 Change-Id: I4d8750b7675a1763ac1dc3dfd2c4e5708e16f7c2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-06Bump version to 0.43Carmi Grushko
Reviewed By: hick209 Differential Revision: D43041453 fbshipit-source-id: 308a07b181f55146419884a90e9bf9d39c8e25af
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 17:59:57 +0000