summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatvei Malkov <malkov@google.com>2019-02-26 17:35:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-02-26 17:35:04 +0000
commit610ca1db29493fdcd3789d8093a6bc96f3bf000b (patch)
tree3031abba104d5e5d2abef673cbe513770d2001c3
parent1ef07afd446ba26a56edc54d5b16afcc22a6ebef (diff)
parent8d1c18d501f4ca2dafda0b28c15a32b9a0da9730 (diff)
downloadktlint-android10-qpr3-release.tar.gz
Merge "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-release
-rw-r--r--ktlint-android-all.r4a.jarbin50630244 -> 0 bytes
-rwxr-xr-xktlint.py2
2 files changed, 1 insertions, 1 deletions
diff --git a/ktlint-android-all.r4a.jar b/ktlint-android-all.r4a.jar
deleted file mode 100644
index ccf889c..0000000
--- a/ktlint-android-all.r4a.jar
+++ /dev/null
Binary files differ
diff --git a/ktlint.py b/ktlint.py
index bd65b6e..de256cd 100755
--- a/ktlint.py
+++ b/ktlint.py
@@ -25,7 +25,7 @@ import subprocess
import sys
MAIN_DIRECTORY = os.path.normpath(os.path.dirname(__file__))
-KTLINT_JAR = os.path.join(MAIN_DIRECTORY, 'ktlint-android-all.r4a.jar')
+KTLINT_JAR = os.path.join(MAIN_DIRECTORY, 'ktlint-android-all.jar')
FORMAT_MESSAGE = '''
**********************************************************************
To format run: