Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: Iddcf9ee1c3f81b1c6bd485eef9f1116e94356de2
diff --git a/ktlint-android-all.jar b/ktlint-android-all.jar
index 9584905..fce8357 100644
--- a/ktlint-android-all.jar
+++ b/ktlint-android-all.jar
Binary files differ
diff --git a/ktlint.py b/ktlint.py
index 697a0d6..de256cd 100755
--- a/ktlint.py
+++ b/ktlint.py
@@ -26,6 +26,12 @@
MAIN_DIRECTORY = os.path.normpath(os.path.dirname(__file__))
KTLINT_JAR = os.path.join(MAIN_DIRECTORY, 'ktlint-android-all.jar')
+FORMAT_MESSAGE = '''
+**********************************************************************
+To format run:
+{}/ktlint.py --format --file {}
+**********************************************************************
+'''
def main(args=None):
@@ -35,12 +41,15 @@
parser.add_argument('--noformat', dest='format', action='store_false')
parser.set_defaults(format=False)
args = parser.parse_args()
- ktlint_args = [f for f in args.file if f.endswith('.kt')]
+ kt_files = [f for f in args.file if f.endswith('.kt') or f.endswith('.kts')]
+ ktlint_args = kt_files[:]
if args.format:
ktlint_args += ['-F']
if not ktlint_args:
sys.exit(0)
+ ktlint_args += ['--android']
+
ktlint_env = os.environ.copy()
ktlint_env['JAVA_CMD'] = 'java'
try:
@@ -50,6 +59,7 @@
if stdout:
print 'prebuilts/ktlint found errors in files you changed:'
print stdout
+ print FORMAT_MESSAGE.format(MAIN_DIRECTORY, ' '.join(kt_files))
sys.exit(1)
else:
sys.exit(0)
