Merge pull request #3672 from FloEdelmann/android-studio-code-style

Include Android Studio's code style settings in Git
streetcomplete · Jan 27, 2022 · d385f10 · d385f10
2 parents d98df2a + 43a75bf
commit d385f10
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 2 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -13,7 +13,7 @@ tab_width = 4
 [*.{java,py}]
 indent_style = tab
 
-[*.kt]
+[*.{kt,kts}]
 indent_style = space
 indent_size = 4
 

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 /.gradle
-/.idea/
+/.idea/*
+!.idea/codeStyles
 /local.properties
 .DS_Store
 /build

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml