From a596e34acebf4fb8c883354fdd749660c029e202 Mon Sep 17 00:00:00 2001 From: Sean Mac Gillicuddy Date: Wed, 24 Jul 2019 15:11:33 +0100 Subject: [PATCH] #1370 install git hooks on prebuild - update editorconfig from project codestyle settings --- .editorconfig | 49 +++++++++++++++++++----------- .idea/codeStyles/Project.xml | 1 + app/build.gradle | 11 +++++++ team-props/git-hooks.gradle | 26 ++++++++++++++++ team-props/git-hooks/pre-commit.sh | 16 ++++++++++ 5 files changed, 86 insertions(+), 17 deletions(-) create mode 100644 team-props/git-hooks.gradle create mode 100644 team-props/git-hooks/pre-commit.sh diff --git a/.editorconfig b/.editorconfig index ef1be2e92..98e140b3a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,20 +1,35 @@ -# EditorConfig is awesome: https://EditorConfig.org - -# top-most EditorConfig file -root = true - -# Unix-style newlines with a newline ending every file [*] -end_of_line = lf -indent_style = space -indent_size = 2 -insert_final_newline = true -charset = utf-8 -# android studio / intellij specific, also in squares android style guide: -# https://github.com/kiwix/kiwix-android/blob/master/docs/codestyle.md -continuation_indent_size = 4 +charset=utf-8 +end_of_line=lf +insert_final_newline=true +indent_style=space +indent_size=2 -# windows command files need windows newline -[*.{bat, cmd}] -end_of_line = crlf +[{*.sht,*.html,*.shtm,*.shtml,*.htm}] +indent_style=space +indent_size=4 + +[*.json] +indent_style=space +indent_size=2 + +[*.properties] +indent_style=space +indent_size=4 + +[.editorconfig] +indent_style=space +indent_size=4 + +[{*.pyw,*.py}] +indent_style=space +indent_size=4 + +[{*.yml,*.yaml}] +indent_style=space +indent_size=2 + +[{*.markdown,*.md,*.mkd}] +indent_style=space +indent_size=4 diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index d8199641c..b7c6bc1aa 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -9,6 +9,7 @@ +