[android] Fix ktlint settings (expo#13814)

FelipeACP · Sep 18, 2021 · ec36ec7 · ec36ec7
1 parent 762e2ff
commit ec36ec7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -118,9 +118,14 @@ subprojects {
     kotlin {
       target '**/*.kt'
       ktlint("0.41.0").userData([
-          "disabled_rules"          : "no-wildcard-imports,import-ordering",
-          "indent_size"             : "2",
-          "continuation_indent_size": "4"
+        "disabled_rules"           : "no-wildcard-imports,import-ordering",
+        "charset"                  : "utf-8",
+        "end_of_line"              : "lf",
+        "indent_size"              : "2",
+        "indent_style"             : "space",
+        "insert_final_newline"     : "true",
+        "tab_width"                : "2",
+        "trim_trailing_whitespace" : "true"
       ])
       trimTrailingWhitespace()
       indentWithSpaces()

diff --git a/apps/bare-expo/android/build.gradle b/apps/bare-expo/android/build.gradle
@@ -83,10 +83,15 @@ subprojects {
   spotless {
     kotlin {
       target '**/*.kt'
-      ktlint().userData([
-          "disabled_rules"          : "no-wildcard-imports,import-ordering",
-          "indent_size"             : "2",
-          "continuation_indent_size": "4"
+      ktlint("0.41.0").userData([
+        "disabled_rules"           : "no-wildcard-imports,import-ordering",
+        "charset"                  : "utf-8",
+        "end_of_line"              : "lf",
+        "indent_size"              : "2",
+        "indent_style"             : "space",
+        "insert_final_newline"     : "true",
+        "tab_width"                : "2",
+        "trim_trailing_whitespace" : "true"
       ])
       trimTrailingWhitespace()
       indentWithSpaces()