summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-10-06Allow preupload hooks to ignore more formatting ktlint rulesandroid-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 a --no-verify-format rule to ktlint.py so that preuploads can ignore more formatting rules. This will be used by projects who already use ktfmt for formatting new files, so that useful ktlint errors (like unused variables) are not hidden by a ton of ktlint formatting issues which we are now mostly ignoring. Bug: 235461679 Test: Manual Change-Id: I324bcaf4e9e2b087201810343471a55f2434339f
2022-06-10Fix ktlint hook am: 4149cdeb01 am: ca97269aa5Jordan Demeulenaere
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/ktlint/+/18832126 Change-Id: Idf55d6e6f3ec179b76b0cd5e31d3b9c3a1e1ca11 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10Fix ktlint hook am: 4149cdeb01Jordan Demeulenaere
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/ktlint/+/18832126 Change-Id: Id37e1956596e815eaa3c87049c44f1eaeca51c47 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10Fix ktlint hookJordan Demeulenaere
In ag/18798895, I broke the early exit condition when the ktlint hook would receive 0 Kotlin files. Since that CL, ktlint would always run on a big number of files if th CL didn't contain any change in a .kt or .kts file. Bug: 235461679 Test: Manual Change-Id: Iaf21df8e85943229c1d832b186825b41cf231b2d
2022-06-10Configure ktlint the same way as google3 does am: de088d407c am: c39a0cc1fdJordan Demeulenaere
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/ktlint/+/18798895 Change-Id: If9debee9c628fb54b59627d114b5ff5bfde9e82e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10Configure ktlint the same way as google3 does am: de088d407cJordan Demeulenaere
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/ktlint/+/18798895 Change-Id: I198974f57e049fe8f81ca85aa35838696ff6fb9c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10Configure ktlint the same way as google3 doesJordan Demeulenaere
Given that we are going to use ktfmt to format our files and that ktlint and ktfmt don't agree on indentation rules, let's configure ktlint to disable rules that clash with ktfmt. The configuration is the same as in google3 [1] with those additional changes: * Indentation is set to 4. * wrapping rule is disabled. This is not disabled in google3 yet because this rules is causing issue starting from release 0.45 and google3 is on 0.43 (while we are on 0.46/master). [1] http://google3/third_party/kotlin/ktlint/.editorconfig Bug: 235461679 Test: Manual Change-Id: I851e511db06ae38ea89be0f90a86746a1fa92dac
2022-05-24Update ktlint prebuilt to 0.46.0 am: 1aaf3e4b03 am: 90582e6152Nicolo' Mazzucato
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/ktlint/+/18588224 Change-Id: Ida648076441be6128f151b286c8d62d7943a02a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24Update ktlint prebuilt to 0.46.0 am: 1aaf3e4b03Nicolo' Mazzucato
Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/ktlint/+/18588224 Change-Id: Iee3b4d8574f106079e89ef204ab2de140032b019 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24Update ktlint prebuilt to 0.46.0Nicolo' Mazzucato
The jar has been taken from ab/8635833 artifacts. (ktlint-0.46.0-SNAPSHOT-all.jar) Test: prebuilds/ktlint/ktlint.py --format --file <kotlin file> Fixes: 231305338 Change-Id: Ib57e759460bac8fd584188ef4499792680212a2c
2022-03-23Fix ktlint formatting. am: bfc4cbe959 am: a2f8726ba9 am: 56efda64d7 am: ↵Dave Mankoff
b549aeeae2 am: a407992cf4 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/2039263 Change-Id: Ie7c262a9351e32885e764b79feca6769d427c011
2022-03-23Fix ktlint formatting. am: bfc4cbe959 am: a2f8726ba9 am: 56efda64d7 am: ↵aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000android13-mainline-tzdata4-releaseaml_tz4_332714010Dave Mankoff
b549aeeae2 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/2039263 Change-Id: Icbd1598c1e1ee2684dd85a749c1d5e578bf57d9c
2022-03-23Fix ktlint formatting. am: bfc4cbe959 am: a2f8726ba9 am: 56efda64d7 am: ↵Dave Mankoff
b549aeeae2 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/2039263 Change-Id: I9ac4774fefc2811ebf70a4f87ddc6eab7a4e256b
2022-03-23Fix ktlint formatting. am: bfc4cbe959 am: a2f8726ba9 am: 56efda64d7ub-automotive-master-20221102t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000main-16kandroid13-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devDave Mankoff
Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/2039263 Change-Id: I19b3e07f40b439b1fc05e691d0fe83c59ba92b79
2022-03-23Fix ktlint formatting. am: bfc4cbe959 am: a2f8726ba9Dave Mankoff
Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/2039263 Change-Id: Ib7570461614545ade211b74182e07f201e791a46
2022-03-23Fix ktlint formatting. am: bfc4cbe959Dave Mankoff
Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/2039263 Change-Id: Idf4b94f83ccc613bf23b224eb8a46a3c1696f905
2022-03-23Fix ktlint formatting.Dave Mankoff
Decode it as utf-8 to fix the output. Fixes: 226370498 Test: manual Change-Id: Ia4317fe445c6705dbf24bdc57a7f4a88f7ebc0f5
2021-11-11Update ktlint.py hashbang to Python 3 am: e0287ddf91 am: 4dfff5abad am: ↵Ember Rose
5ec9533779 am: df4d427876 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/1889435 Change-Id: I017bcfa23734dcb37d2fdeaaf76021f5ac88fed9
2021-11-11Update ktlint.py hashbang to Python 3 am: e0287ddf91 am: 4dfff5abad am: ↵Ember Rose
5ec9533779 Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/1889435 Change-Id: I9e675633c7cc1bcfa2d5eaa35cbe950da0631286
2021-11-11Update ktlint.py hashbang to Python 3 am: e0287ddf91 am: 4dfff5abadEmber Rose
Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/1889435 Change-Id: I490384fdcdd6931f17b594f7a720350ca4c17477
2021-11-11Update ktlint.py hashbang to Python 3 am: e0287ddf91android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1temp_sam_210511427android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Ember Rose
Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/1889435 Change-Id: Ia0074d2988063f0ad6b1501bcb9fc6d6274eede4
2021-11-11Update ktlint.py hashbang to Python 3Ember Rose
Change-Id: I3b3b5064c8d52ddd241785914ae1e58b8d2150e1 Test: Run ktlint as a repo hook Bug: 186749906
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵android-vts-12.1_r9android-vts-12.1_r8android-vts-12.1_r7android-vts-12.1_r6android-vts-12.1_r5android-vts-12.1_r4android-vts-12.1_r3android-vts-12.1_r2android-vts-12.1_r10android-vts-12.1_r1android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-platform-12.1.0_r9android-platform-12.1.0_r8android-platform-12.1.0_r7android-platform-12.1.0_r6android-platform-12.1.0_r5android-platform-12.1.0_r4android-platform-12.1.0_r3android-platform-12.1.0_r28android-platform-12.1.0_r27android-platform-12.1.0_r26android-platform-12.1.0_r25android-platform-12.1.0_r24android-platform-12.1.0_r23android-platform-12.1.0_r22android-platform-12.1.0_r21android-platform-12.1.0_r20android-platform-12.1.0_r2android-platform-12.1.0_r19android-platform-12.1.0_r18android-platform-12.1.0_r17android-platform-12.1.0_r16android-platform-12.1.0_r15android-platform-12.1.0_r14android-platform-12.1.0_r13android-platform-12.1.0_r12android-platform-12.1.0_r11android-platform-12.1.0_r10android-platform-12.1.0_r1android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r4android-mainline-12.0.0_r39android-mainline-12.0.0_r36android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100android-cts-12.1_r9android-cts-12.1_r8android-cts-12.1_r7android-cts-12.1_r6android-cts-12.1_r5android-cts-12.1_r4android-cts-12.1_r3android-cts-12.1_r2android-cts-12.1_r10android-cts-12.1_r1android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r6android-12.1.0_r5android-12.1.0_r4android-12.1.0_r3android-12.1.0_r27android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r2android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.1.0_r1android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16aml_tz3_311312010android12L-tests-releaseandroid12L-s1-releaseandroid12L-releaseandroid12L-platform-releaseandroid12L-gsiandroid12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-mainline-networkstack-releaseandroid12-mainline-art-releaseandroid12-devandroid12--mainline-releaseandroid-s-v2-preview-1Xin Li
stag-aosp-master am: 12e4973a91 -s ours am: 0c32278962 am: a3f6c8dd6a am: aafe201a62 -s ours am skip reason: subject contains skip directive Change-Id: Iaf8f1216221ff698ffd76006e930238700728a48
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵android-s-preview-1android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
stag-aosp-master am: 12e4973a91 -s ours am: 0c32278962 am: a3f6c8dd6a Change-Id: I07f8f7a0534c7bde97a782f706e2bfdc23bee0e5
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 12e4973a91 -s ours am: 0c32278962 Change-Id: I7dfc828749407b71ebb24dad697f478768a834ea
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 12e4973a91 -s ours am skip reason: subject contains skip directive Change-Id: I8ec0d2698e0fc9efc4c48fe51d49f4cd2310eec7
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterandroid-r-beta-3android-r-beta-2androidx-sqlite-inspection-releaseXin Li
Bug: 151763422 Change-Id: I1e496b24ea5019024e07305d9602bf1fe1c631bf
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: af28e03956 -s ours am: 1eeba3ee4a am: 30cd40fbfb am: f1404fdfe2 -s ours am skip reason: subject contains skip directive Change-Id: Idba0341142dd055be3afd7f72cafb9cf0d2b40fb
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: af28e03956 -s ours am: 1eeba3ee4a am: 30cd40fbfb Change-Id: I13f8cc6136ebaf702bcea914cfdb4525b4522fd5
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: af28e03956 -s ours am: 1eeba3ee4a Change-Id: I7c883c9e9e62eed06dd14d06c2f447e3de006b26
2020-03-19DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li
stag-aosp-master am: af28e03956 Change-Id: Ib4bd094a9d5981f626548f60f7e5ab668af67cea
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: af28e03956 -s ours am skip reason: subject contains skip directive Change-Id: Id4ee8a980066458165abb60d20e01720ded96eaf
2020-03-18DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I148c6df6242214e29fe6a4bd30bf344deb3e610b
2020-02-11Add support for python3 am: 67e7d247a4 am: fddd5e7bee am: 75d70462ear_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-b-releaseAutomerger Merge Worker
Change-Id: I72a81853ebd9198e5d45f43e3572d8d546d1182d
2020-02-11Add support for python3 am: 67e7d247a4 am: fddd5e7beeAutomerger Merge Worker
Change-Id: I518018b99901f627b741db42c7e69dde3f76318e
2020-02-11Add support for python3 am: 67e7d247a4android-r-preview-4android-r-preview-3android-r-preview-2androidx-wear-releaseandroidx-swiperefreshlayout-releaseandroidx-slidingpanelayout-releaseandroidx-security-security-crypto-releaseandroidx-emoji-releaseandroidx-drawerlayout-releaseandroidx-customview-releaseAutomerger Merge Worker
Change-Id: I5d32460315b2f2423a81ed6fad33a5a17aca6ec1
2020-02-09Add support for python3Luca Stefani
Change-Id: I4b9869ff2603d7f2aea39572d47a46fbae394bee
2019-02-26Merge "Revert "Add r4a-friendly ktlint.jar""q_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-r-preview-1android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12q_tzdata_aml_297100000ndk-sysroot-r21androidx-sharetarget-releaseandroidx-recyclerview-recyclerview-selection-releaseandroidx-localbroadcastmanager-releaseandroidx-coordinatorlayout-releaseandroidx-browser-releaseandroidx-biometric-releaseandroidx-benchmark-releaseandroidx-autofill-releaseandroidx-annotation-annotation-experimental-releaseandroid12-mainline-tzdata-releaseandroid10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid10-android13-mainline-tzdata-releaseMatvei Malkov
2019-02-26Revert "Add r4a-friendly ktlint.jar"Matvei Malkov
This reverts commit a54e654be36a2bf8021ca7f838d86a92b70af642. Reason for revert: was merged to master, but is suppose to go to crane only branch Change-Id: I1825b8f0191608dccdaa19640df34c4f4d6acb83
2019-02-26Merge "Add r4a-friendly ktlint.jar"Matvei Malkov
2019-02-25Add r4a-friendly ktlint.jarMatvei Malkov
This CL adds custom build ktlink.r4a.jar to run presumbit check while `repo upload`. Previous version wasn't working so developer were using `repo upload --no-verify`, which results in a lot of inconsistensies with codestyle as well as absence other checks (style checks, checks for proper api update, etc). This CL adds proper jar file only, script that will automate this jar update when new r4a version is released will be soon. Note, that in current version ktlint "spacing between operator" rule is turned off so ktlint won't complain about `padding=50.dp` without spaces. Important: Please note, that unused import rule is temporary turned off due to `import com.google.r4a.composer` which looks like unused to ktlint. We need to patch all such imports with `// ktlint-disable` Bug: b/126198541 Test: Test by run `repo upload` with incorrectly and correctly formatted file Change-Id: Ib0e8e05cb83703632af69a3fc4d2a9cbfe43513a
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
am: ddaa13e7fb -s ours am skip reason: subject contains skip directive Change-Id: I2c178b8273b877b87b951736c23a554d1f3f7f4a
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroidx-vectordrawable-releaseandroidx-savedstate-releaseandroidx-room-releaseandroidx-preference-releaseandroidx-paging-legacy-releaseandroidx-mediarouter-releaseandroidx-media2-releaseandroidx-media2-media2-widget-releaseandroidx-media-releaseandroidx-jetifier-releaseandroidx-concurrent-releaseandroidx-arch-core-releaseXin Li
Bug: 120848293 Change-Id: Ic40de7600a0242c71a624a0ecc3506dcde016f1b
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 6550cab4ef -s ours am: 678b022bbd -s ours am: 4a69c81dc2 -s ours Change-Id: I8c7f7ce8ac0749e00f657a5309a5df1c6b211c16
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT ↵Bill Yi
MERGE am: 6550cab4ef -s ours am: 678b022bbd -s ours Change-Id: Icb3bf8c0faac7a13e14694729add3b86877232ab
2018-10-24[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi
am: 6550cab4ef -s ours Change-Id: I2143df19c215802dfb2a2688567b0f3e3d0880d3
2018-10-24Merge pie-platform-release to aosp-master - DO NOT MERGEandroid-wear-8.0.0_r2android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1androidx-collection-releaseandroid-arch-work-releaseandroid-arch-navigation-releaseBill Yi
Change-Id: Iddcf9ee1c3f81b1c6bd485eef9f1116e94356de2
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: ee5cce34ca -s ours am: 362e045571 -s ours Change-Id: I8cb1453bfa7cdb10b78b403edb0b59ce2caae91d
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: ee5cce34ca -s ours Change-Id: I0ac0df9994b849a3134e6c44d417b8ee750937ef
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: Idb4877cf0af45c3dd6c45b15484cbde7d020b38e
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 10:16:19 +0000