diff --git a/README.md b/README.md
index 9ad7c0e..05b1d39 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,14 @@ Java Code Styles
IntelliJ IDEA code style settings for Square's Java and Android projects.
+Deprecated
+----------
+
+These code styles aren't maintained anymore. Block / Square has adopted
+[ktfmt](https://github.com/facebook/ktfmt) with its code style.
+[`.editorconfig`](https://spec.editorconfig.org/index.html) files are a better alternative to share
+code styles and are supported in Jetbrains IDEs.
+
Installation
------------
diff --git a/configs/codestyles/Square.xml b/configs/codestyles/Square.xml
index 0d5bd27..ebee07c 100644
--- a/configs/codestyles/Square.xml
+++ b/configs/codestyles/Square.xml
@@ -70,6 +70,16 @@
+
+
+
+
+
+
+
+
@@ -245,6 +255,13 @@
+
+
+
+
+
+
+
@@ -278,4 +295,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/configs/codestyles/SquareAndroid.xml b/configs/codestyles/SquareAndroid.xml
index 9601db8..a099107 100644
--- a/configs/codestyles/SquareAndroid.xml
+++ b/configs/codestyles/SquareAndroid.xml
@@ -6,11 +6,6 @@
-
-
-
-
-
@@ -35,7 +30,6 @@
-
@@ -78,16 +72,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -111,15 +139,12 @@
-
-
-
@@ -145,7 +170,6 @@
-
@@ -155,7 +179,6 @@
-
@@ -190,7 +213,6 @@
-
@@ -198,12 +220,9 @@
-
-
-
@@ -220,28 +239,43 @@
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
@@ -261,7 +295,6 @@
-
@@ -310,7 +343,7 @@
-
+
@@ -362,6 +395,17 @@
BY_NAME
+
+
+
+
+ app:layout_.*
+ http://schemas.android.com/apk/res-auto
+
+
+ BY_NAME
+
+
-
\ No newline at end of file
+
diff --git a/configs/inspection/Square.xml b/configs/inspection/Square.xml
index 361afca..a87576b 100644
--- a/configs/inspection/Square.xml
+++ b/configs/inspection/Square.xml
@@ -1,7 +1,46 @@
-
-
+
+
+
+
+
-
-
+
+
+
+
diff --git a/configs/options/editor.codeinsight.xml b/configs/options/editor.codeinsight.xml
index 8733999..e46761d 100644
--- a/configs/options/editor.codeinsight.xml
+++ b/configs/options/editor.codeinsight.xml
@@ -3,7 +3,9 @@
+
+
@@ -12,6 +14,5 @@
-
diff --git a/install.bat b/install.bat
index a2b416c..884691c 100644
--- a/install.bat
+++ b/install.bat
@@ -4,9 +4,12 @@ echo Installing Square IntelliJ configs...
setlocal enableDelayedExpansion
-for /D %%i in (%userprofile%\.AndroidStudio*) do call :copy_config %%i
-for /D %%i in (%userprofile%\.IdeaIC*) do call :copy_config %%i
-for /D %%i in (%userprofile%\.IntelliJIdea*) do call :copy_config %%i
+for /D %%i in ("%userprofile%"\.AndroidStudio*) do call :copy_config "%%i"
+for /D %%i in ("%userprofile%"\.IdeaIC*) do call :copy_config "%%i"
+for /D %%i in ("%userprofile%"\.IntelliJIdea*) do call :copy_config "%%i"
+for /D %%i in ("%userprofile%"\.AndroidStudio*\settingsRepository\repository) do call :copy_config "%%i"
+for /D %%i in ("%userprofile%"\.IdeaIC*\settingsRepository\repository) do call :copy_config "%%i"
+for /D %%i in ("%userprofile%"\.IntelliJIdea*\settingsRepository\repository) do call :copy_config "%%i"
echo.
echo Restart IntelliJ and/or AndroidStudio, go to preferences, and apply 'Square' or 'SquareAndroid'.
@@ -15,8 +18,8 @@ exit /b
REM sub function for copy config files
:copy_config
set config_dir=%~1\config
-echo Installing to !config_dir!
-xcopy /s configs !config_dir!
+echo Installing to "!config_dir!"
+xcopy /s configs "!config_dir!"
echo Done.
echo.
exit /b
diff --git a/install.sh b/install.sh
index a03a9a1..9e08c77 100755
--- a/install.sh
+++ b/install.sh
@@ -10,21 +10,25 @@ for i in $HOME/Library/Preferences/IntelliJIdea* \
$HOME/Library/Preferences/AndroidStudio* \
$HOME/.IntelliJIdea*/config \
$HOME/.IdeaIC*/config \
- $HOME/.AndroidStudio*/config
+ $HOME/.AndroidStudio*/config \
+ $HOME/Library/Application\ Support/JetBrains/IntelliJIdea* \
+ $HOME/Library/Application\ Support/Google/AndroidStudio* \
+ $HOME/Library/Application\ Support/JetBrains/IdeaIC* \
+ $HOME/Library/Application\ Support/Google/AndroidStudio*/settingsRepository/repository \
+ $HOME/Library/Application\ Support/JetBrains/IdeaIC*/settingsRepository/repository
do
- if [[ -d $i ]]; then
-
+ if [[ -d "$i" ]]; then
# Install codestyles
- mkdir -p $i/codestyles
- cp -frv "$CONFIGS/codestyles"/* $i/codestyles
+ mkdir -p "$i/codestyles"
+ cp -frv "$CONFIGS/codestyles"/* "$i/codestyles"
# Install inspections
- mkdir -p $i/inspection
- cp -frv "$CONFIGS/inspection"/* $i/inspection
+ mkdir -p "$i/inspection"
+ cp -frv "$CONFIGS/inspection"/* "$i/inspection"
# Install options ("Exclude from Import and Completion")
- mkdir -p $i/options
- cp -frv "$CONFIGS/options"/* $i/options
+ mkdir -p "$i/options"
+ cp -frv "$CONFIGS/options"/* "$i/options"
fi
done