aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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: 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 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: 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
2023-02-02Revert "Merge tag 'v0.42' into update" am: 0c522a74a4 am: d77cb22dff am: ↵Jordan Demeulenaere
1f24f1b696 Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2417432 Change-Id: I7f872a9d871e382f830c0ab7c3ea28ea513d0bb3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02Revert "Merge tag 'v0.42' into update" am: 0c522a74a4 am: d77cb22dffJordan Demeulenaere
Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2417432 Change-Id: I577a8ecaca81ac96ce1b0ed26bee8175d1e13807 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02Revert "Merge tag 'v0.42' into update" am: 0c522a74a4Jordan Demeulenaere
Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2417432 Change-Id: I9f2299d6d1017cb7973322ca5f8f6a051cd4f55a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-02Fix indentation of initializer-like expressions with leading comments (#382)nickreid
Summary: Pull Request resolved: https://github.com/facebook/ktfmt/pull/382 Reviewed By: hick209 Differential Revision: D42801455 Pulled By: cgrushko fbshipit-source-id: c53eb78591d5c23301bb2bafd84f89c5bb7a7a33
2023-02-02Replace prepare_upgrade.sh by a Python equivalentJordan Demeulenaere
Bug: 266197805 Test: Manual Change-Id: Idc50e62f6b845bdeff089dfd2fe0d78bfcf1c644
2023-02-01Revert "Merge tag 'v0.42' into update"Jordan Demeulenaere
This reverts commit 2b7199e5e996a3e10f35fee447c4a44e4f95680f. Reason for revert: Discussed offline Change-Id: Ic27149048d0629b717967f87ad5ad186bc0f9b9c
2023-02-01Create FenceCommentsOp and use it to simplify some confusing comment ↵nickreid
handling situations (#381) Summary: Pull Request resolved: https://github.com/facebook/ktfmt/pull/381 Reviewed By: hick209 Differential Revision: D42801446 Pulled By: cgrushko fbshipit-source-id: 1c41be728e25715499d83f47a6d3acf0c8214bd5
2023-01-31Create a prepare_upgrade.sh script to help for upgrades am: dfe7dbe093 am: ↵Jordan Demeulenaere
9aed6e846d Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ktfmt/+/21114318 Change-Id: Iad570bb5c5069f8ebd281c8e4a6c026f1aa51a44 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31Create a prepare_upgrade.sh script to help for upgrades am: dfe7dbe093Jordan Demeulenaere
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ktfmt/+/21114318 Change-Id: I034d3a78ba9fb3c3716174b5af9f21594c9fb382 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-30Create a prepare_upgrade.sh script to help for upgradesJordan Demeulenaere
This CL introduces a helper script to make it easier to upgrade ktfmt. It creates maximum 2 CLs per repository already using ktfmt: - One that regenerates the ktfmt_includes.txt with the current version of ktfmt, so that all files already properly formatted are checked and files that are not already formatted are ignored. If the file is already up-to-date, then this CL won't be created. - One that reformats all files with the new version of ktfmt. This CL won't be created if all files are already formatted. See http://ag/21117371 and http://ag/21117372 for an example of generated CLs. Bug: 266197805 Test: Ran the script and it worked! Change-Id: I6e86c71ead20ec65512202ef2b2900b41f8feb2c
2023-01-27Merge tag 'v0.42' into update am: 2b7199e5e9 am: 87c086503a am: 18539dc2c6Jordan Demeulenaere
Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2402649 Change-Id: Id75dbb0a817c597f6ac6c0dcf0c010b4dd5aa44c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27Merge tag 'v0.42' into update am: 2b7199e5e9 am: 87c086503aJordan Demeulenaere
Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2402649 Change-Id: I84c826893ba2fc32fe4519e4c82c3b5c48738876 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27Merge tag 'v0.42' into update am: 2b7199e5e9Jordan Demeulenaere
Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2402649 Change-Id: Ic98243e3835561d120a7fc923d4ff3b3605d791f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27Merge tag 'v0.42' into updateJordan Demeulenaere
This CL updates the source of ktfmt to the latest release v0.42. This CL was created using: $ git fetch --all --tags $ git merge --no-ff --allow-unrelated-histories v0.42 * tag 'v0.42': (40 commits) Bump version to 0.42 Avoid early break at TODO: Rename upper to endPosition Use map for converting a collection Remove unnecessary import Factor out code into a function Drop I from column variable name Fix import detection for multiline kdocs Merge tnorbye/kdoc-formatter into ktfmt (#359) Preserve indentation of trailing comments in comma-separated lists (#357) Bump json-schema and jsprim in /website (#355) Bump yargs-parser and yargs in /website (#356) Update ktfmt component on FBS:master Bump version to 0.42-SNAPSHOT Bump version to 0.41 Fix some regressions in preparation for 0.41 (#352) Only pretty-print each file one time (#345) Replace $QQQ with $TQ in unit tests Force-break an indent qualified expression rooted on multiline strings (#343) Fix unneeded break following long multiline string (google style) (#348) ... Test: m ktfmt Bug: 266197805 Change-Id: I811fb080acd086ed000bfa2af2bde4b98b92c738
2023-01-26Eliminate mis-paired OpsBuilder.open()/close() (#379)Nick Reid
Summary: These explicit calls are misleading because they pair with the calls inside OpsBuilder.block(), so the indention of the source doesn't match the block structure of the output. I believe the only potentially affected case is unnamed function-literal-type params, which cannot have initializers, making this a no-op. Pull Request resolved: https://github.com/facebook/ktfmt/pull/379 Reviewed By: strulovich Differential Revision: D42768487 Pulled By: cgrushko fbshipit-source-id: caed350dd7c78ee33df29c60b60cdf013bb9b1e8
2023-01-26Bump decode-uri-component from 0.2.0 to 0.2.2 in /website (#369)dependabot[bot]
Summary: Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/SamVerschueren/decode-uri-component/releases">decode-uri-component's releases</a>.</em></p> <blockquote> <h2>v0.2.2</h2> <ul> <li>Prevent overwriting previously decoded tokens 980e0bf</li> </ul> <p><a href="https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.1...v0.2.2">https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.1...v0.2.2</a></p> <h2>v0.2.1</h2> <ul> <li>Switch to GitHub workflows 76abc93</li> <li>Fix issue where decode throws - fixes <a href="https://github-redirect.dependabot.com/SamVerschueren/decode-uri-component/issues/6">https://github.com/facebook/ktfmt/issues/6</a> 746ca5d</li> <li>Update license (<a href="https://github-redirect.dependabot.com/SamVerschueren/decode-uri-component/issues/1">https://github.com/facebook/ktfmt/issues/1</a>) 486d7e2</li> <li>Tidelift tasks a650457</li> <li>Meta tweaks 66e1c28</li> </ul> <p><a href="https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.1">https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.1</a></p> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/SamVerschueren/decode-uri-component/commit/a0eea469d26eb0df668b081672cdb9581feb78eb"><code>a0eea46</code></a> 0.2.2</li> <li><a href="https://github.com/SamVerschueren/decode-uri-component/commit/980e0bf09b64d94f1aa79012f895816c30ffd152"><code>980e0bf</code></a> Prevent overwriting previously decoded tokens</li> <li><a href="https://github.com/SamVerschueren/decode-uri-component/commit/3c8a373dd4837e89b3f970e01295dd03e1405a33"><code>3c8a373</code></a> 0.2.1</li> <li><a href="https://github.com/SamVerschueren/decode-uri-component/commit/76abc939783fe3900fadb7d384a74d324d5557f3"><code>76abc93</code></a> Switch to GitHub workflows</li> <li><a href="https://github.com/SamVerschueren/decode-uri-component/commit/746ca5dcb6667c5d364e782d53c542830e4c10b9"><code>746ca5d</code></a> Fix issue where decode throws - fixes <a href="https://github-redirect.dependabot.com/SamVerschueren/decode-uri-component/issues/6">https://github.com/facebook/ktfmt/issues/6</a></li> <li><a href="https://github.com/SamVerschueren/decode-uri-component/commit/486d7e26d3a8c0fbe860fb651fe1bc98c2f2be30"><code>486d7e2</code></a> Update license (<a href="https://github-redirect.dependabot.com/SamVerschueren/decode-uri-component/issues/1">https://github.com/facebook/ktfmt/issues/1</a>)</li> <li><a href="https://github.com/SamVerschueren/decode-uri-component/commit/a65045724e6234acef87f31da499d4807b20b134"><code>a650457</code></a> Tidelift tasks</li> <li><a href="https://github.com/SamVerschueren/decode-uri-component/commit/66e1c2834c0e189201cb65196ec3101372459b02"><code>66e1c28</code></a> Meta tweaks</li> <li>See full diff in <a href="https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=decode-uri-component&package-manager=npm_and_yarn&previous-version=0.2.0&new-version=0.2.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `dependabot rebase` will rebase this PR - `dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `dependabot merge` will merge this PR after your CI passes on it - `dependabot squash and merge` will squash and merge this PR after your CI passes on it - `dependabot cancel merge` will cancel a previously requested merge and block automerging - `dependabot reopen` will reopen this PR if it is closed - `dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) - `dependabot use these labels` will set the current labels as the default for future PRs for this repo and language - `dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language - `dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language - `dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/facebook/ktfmt/network/alerts). </details> Pull Request resolved: https://github.com/facebook/ktfmt/pull/369 Reviewed By: hick209 Differential Revision: D42777283 Pulled By: cgrushko fbshipit-source-id: 3d09bca5a3eddbe6da21ec422fc4789e3c4a78e9
2023-01-26Updated maven-jar-plugin and maven-assembly-plugin from version 2.6 to 3.3.0 ↵Joe Dean
(#363) Summary: This resolves an error, detailed below. I believe that this error is specific to Apple's M1/M2 computers, based only on [this issue report](https://github.com/Kotlin/kotlin-interactive-shell/issues/63). Bumping the version of `maven-jar-plugin` and `maven-assembly-plugin` resolves the issue (both plugin versions need to be updated, or the issue persists). <hr> OS: macOS Monterey 12.6 Chip: Apple M2 Maven: Apache Maven 3.8.6 *(installed via [Homebrew](https://formulae.brew.sh/formula/maven))* Java: 19 *(installed via [Homebrew](https://formulae.brew.sh/formula/openjdk))* Attempting to build `mvn install` with the previous `pom.xml` configuration fails with the following error: ``` [ERROR] Failed to execute goal org.apache.maven.plugins:maven-jar-plugin:2.6:jar (default-jar) on project ktfmt: Execution default-jar of goal org.apache.maven.plugins:maven-jar-plugin:2.6:jar failed: An API incompatibility was encountered while executing org.apache.maven.plugins:maven-jar-plugin:2.6:jar: java.lang.ExceptionInInitializerError: null [ERROR] ----------------------------------------------------- [ERROR] realm = plugin>org.apache.maven.plugins:maven-jar-plugin:2.6 [ERROR] strategy = org.codehaus.plexus.classworlds.strategy.SelfFirstStrategy [ERROR] urls[0] = file:~/.m2/repository/org/apache/maven/plugins/maven-jar-plugin/2.6/maven-jar-plugin-2.6.jar [ERROR] urls[1] = file:~/.m2/repository/org/slf4j/slf4j-jdk14/1.5.6/slf4j-jdk14-1.5.6.jar [ERROR] urls[2] = file:~/.m2/repository/org/slf4j/jcl-over-slf4j/1.5.6/jcl-over-slf4j-1.5.6.jar [ERROR] urls[3] = file:~/.m2/repository/org/apache/maven/reporting/maven-reporting-api/2.2.1/maven-reporting-api-2.2.1.jar [ERROR] urls[4] = file:~/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.1/doxia-sink-api-1.1.jar [ERROR] urls[5] = file:~/.m2/repository/org/apache/maven/doxia/doxia-logging-api/1.1/doxia-logging-api-1.1.jar [ERROR] urls[6] = file:~/.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar [ERROR] urls[7] = file:~/.m2/repository/commons-cli/commons-cli/1.2/commons-cli-1.2.jar [ERROR] urls[8] = file:~/.m2/repository/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar [ERROR] urls[9] = file:~/.m2/repository/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar [ERROR] urls[10] = file:~/.m2/repository/org/sonatype/plexus/plexus-sec-dispatcher/1.3/plexus-sec-dispatcher-1.3.jar [ERROR] urls[11] = file:~/.m2/repository/org/sonatype/plexus/plexus-cipher/1.4/plexus-cipher-1.4.jar [ERROR] urls[12] = file:~/.m2/repository/org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.jar [ERROR] urls[13] = file:~/.m2/repository/org/apache/maven/maven-archiver/2.6/maven-archiver-2.6.jar [ERROR] urls[14] = file:~/.m2/repository/org/apache/maven/shared/maven-shared-utils/0.7/maven-shared-utils-0.7.jar [ERROR] urls[15] = file:~/.m2/repository/com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1.jar [ERROR] urls[16] = file:~/.m2/repository/org/codehaus/plexus/plexus-utils/3.0.20/plexus-utils-3.0.20.jar [ERROR] urls[17] = file:~/.m2/repository/org/codehaus/plexus/plexus-archiver/2.9/plexus-archiver-2.9.jar [ERROR] urls[18] = file:~/.m2/repository/org/codehaus/plexus/plexus-io/2.4/plexus-io-2.4.jar [ERROR] urls[19] = file:~/.m2/repository/commons-io/commons-io/2.2/commons-io-2.2.jar [ERROR] urls[20] = file:~/.m2/repository/org/apache/commons/commons-compress/1.9/commons-compress-1.9.jar [ERROR] Number of foreign imports: 1 [ERROR] import: Entry[import from realm ClassRealm[maven.api, parent: null]] [ERROR] [ERROR] ----------------------------------------------------- [ERROR] : Index 1 out of bounds for length 1 [ERROR] -> [Help 1] [ERROR] [ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch. [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/PluginContainerException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <args> -rf :ktfmt ``` Pull Request resolved: https://github.com/facebook/ktfmt/pull/363 Reviewed By: hick209 Differential Revision: D42777284 Pulled By: cgrushko fbshipit-source-id: 44b12bdedee5d1b468754145391409f7e9899478
2023-01-26De-inline OpsBuilder.block() (#378)Nick Reid
Summary: As implemented, this function is unsafe to inline. Outer return from the callback would skip the call to builder.close(). Pull Request resolved: https://github.com/facebook/ktfmt/pull/378 Reviewed By: hick209 Differential Revision: D42768488 Pulled By: cgrushko fbshipit-source-id: ce6888fd0e19f977315dc6dd2d95a906d946d6db
2023-01-21Miscellaneous fixes to the KDoc formatter (#372)Tor Norbye
Summary: This CL fixes a number of bugs, covered by associated unit tests: - Line overrun when using closed-open interval notation - More gracefully handle unterminated [] references (for example when comment is using it in things like [closed, open) intervals) - Recognize and convert accidentally capitalized kdoc tags like See - If you have a [ref] which spans a line such that the # ends up as a new line, don't treat this as a "# heading". - Make sure we don't line break at an expression starting with ">" since that would turn into a quoted line. - If you're using optimal line breaking and there's a really long, unbreakable word in the paragraph, switch that paragraph over to greedy line breaking (to make the paragraph better balanced since the really long word throws the algorithm off.) - Fix a few scenarios where markup conversion from <p> and </p> wasn't converting everything. - Allow property[name], not just param[name] - The --hanging-indent flag now also sets the nested list indent (if >= 3) - Some minor code cleanup. Pull Request resolved: https://github.com/facebook/ktfmt/pull/372 Reviewed By: strulovich Differential Revision: D41919138 Pulled By: cgrushko fbshipit-source-id: aae46b67dbcc4dcabe78578c7187b1353cbd8968
2023-01-13[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ↵Xin Li
1f0381665f -s ours am: b1d7c8afb8 -s ours am skip reason: Merged-In Ibc337e4459d8db789f0b2102b71a8b2e1ed2589f with SHA-1 bdb0b8d3fa is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ktfmt/+/20956664 Change-Id: Ic9c98f04790f629e131a7070f997f2bd417a82a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: ↵Xin Li
1f0381665f -s ours am skip reason: Merged-In Ibc337e4459d8db789f0b2102b71a8b2e1ed2589f with SHA-1 bdb0b8d3fa is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ktfmt/+/20956664 Change-Id: I44bd0be25b503abf4ff190469e8c8c7e4a38169c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-11Merge tm-qpr-dev-plus-aosp-without-vendor@9467136Xin Li
Bug: 264720040 Merged-In: Ibc337e4459d8db789f0b2102b71a8b2e1ed2589f Change-Id: Icd4f310d122670281b95d62ba57a9f93bc05a5c4
2022-12-27Update website copyright statementCarmi Grushko
Summary: Source: https://www.internalfb.com/intern/wiki/Open_Source/Launch_an_OSS_Project/Launch_Preparation/Automated_Checkup/Terms_Of_Use_&_Privacy_Policy/#copyright-statement Reviewed By: hick209 Differential Revision: D42243914 fbshipit-source-id: 3f24a265039375555f2343efb5d06b209b62520d
2022-12-16Support disabling import optimization from command lineOmer Strulovich
Summary: Turns out we did not connecting this to our CLI interface, making it impossible to skip imports. Slightly awkward naming (i.e. the flag negates), but it gets the job done, and we don't have a real parser for flags no is the dependency on one worth it. Reviewed By: hick209 Differential Revision: D42105735 fbshipit-source-id: 8ddab2af5310fd59d86e29d6c827b33d47ab10b1
2022-12-12Daily `arc lint --take KTFMT`generatedunixname89002005325672
Reviewed By: adamjernst Differential Revision: D41833756 fbshipit-source-id: 0ecc95aff3bdadadb0769dec55d27fb84fe50e95
2022-12-12Merge "[automerger skipped] Merge Android 13 QPR1 am: 9ab8e02c99 -s ours" ↵Automerger Merge Worker
into stage-aosp-master am: 92603bb800 -s ours am: b51cf4d044 -s ours am skip reason: Merged-In I17e17de40d4c558c617e06a55d27eaeb2743f368 with SHA-1 75418db586 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2338303 Change-Id: Icf2bc7935b288613dfa991d892ed93053509418b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12[automerger skipped] Merge Android 13 QPR1 am: 9ab8e02c99 -s ours am: ↵Xin Li
eb69f5217a -s ours am: e90ccb5ca3 -s ours am skip reason: Merged-In I17e17de40d4c558c617e06a55d27eaeb2743f368 with SHA-1 75418db586 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2338303 Change-Id: If6b0a00db45b1ffdfb8633c651ec2b87f90a1f30 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12[automerger skipped] Merge Android 13 QPR1 am: 9ab8e02c99 -s ours am: ↵Xin Li
1505ce1b5f -s ours am: f5522b8d16 -s ours am skip reason: Merged-In I17e17de40d4c558c617e06a55d27eaeb2743f368 with SHA-1 75418db586 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2338303 Change-Id: Ifc8b84b8cc0c90feac12d8eb1d8e99189e034e04 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-20 14:14:44 +0000