Merge tag 'android-13.0.0_r32' into int/13/fp3
Android 13.0.0 release 32
* tag 'android-13.0.0_r32':
Add a note about the ktfmt plugin
Use absolute paths when giving ktfmt formatting command
Change-Id: I8bbd3cebdb1db8a36c5e29bb8024c236aeb42edf
diff --git a/ktfmt.py b/ktfmt.py
index 6f115f7..3d337bb 100755
--- a/ktfmt.py
+++ b/ktfmt.py
@@ -108,10 +108,13 @@
'**********************************************************************'
)
print(
- 'Some Kotlin files are not properly formatted. Run the following command to format them:\n\n'
- )
+ 'Some Kotlin files are not properly formatted. Run the command below to format them.\n'
+ 'Note: If you are using the Android Studio ktfmt plugin, make sure to select the '
+ 'Kotlinlang style in \'Editor > ktfmt Settings\'.\n')
script_path = os.path.normpath(__file__)
- incorrect_files = stdout.decode('utf-8').splitlines()
+ incorrect_files = [
+ os.path.abspath(file) for file in stdout.decode('utf-8').splitlines()
+ ]
print('$ ' + script_path + ' ' + ' '.join(incorrect_files) + '\n')
print(
'**********************************************************************'