From a6a052781d9a8c5b6ff58230858c11834b27f65a Mon Sep 17 00:00:00 2001 From: tzugen Date: Sat, 19 Mar 2022 12:40:21 +0100 Subject: [PATCH 1/4] Don't exclude the whole .idea folder https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 --- .gitignore | 10 ++- .idea/codeStyles/Project.xml | 124 ++++++++++++++++++++++++++ .idea/codeStyles/codeStyleConfig.xml | 5 ++ .idea/compiler.xml | 6 ++ .idea/copyright/Default.xml | 6 ++ .idea/copyright/profiles_settings.xml | 7 ++ .idea/misc.xml | 4 + .idea/vcs.xml | 6 ++ 8 files changed, 167 insertions(+), 1 deletion(-) create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 .idea/compiler.xml create mode 100644 .idea/copyright/Default.xml create mode 100644 .idea/copyright/profiles_settings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/vcs.xml diff --git a/.gitignore b/.gitignore index e519a2a6..9552187e 100644 --- a/.gitignore +++ b/.gitignore @@ -37,7 +37,15 @@ captures/ # Intellij *.iml -.idea/ +.idea/libraries +.idea/dictionaries +.idea/workspace.xml +.idea/shelf +.idea/jarRepositories.xml +.idea/gradle.xml +.idea/navEditor.xml +.idea/modules.xml + # Keystore files *.jks diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 00000000..61a2c750 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,124 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 00000000..79ee123c --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..fb7f4a8a --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/copyright/Default.xml b/.idea/copyright/Default.xml new file mode 100644 index 00000000..c3d9c501 --- /dev/null +++ b/.idea/copyright/Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 00000000..819d4835 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..59f6372b --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From 126efd35c67e05aaa97d3591e5b427688031131a Mon Sep 17 00:00:00 2001 From: tzugen Date: Sat, 19 Mar 2022 13:26:39 +0100 Subject: [PATCH 2/4] Include official kotlin code style --- .idea/codeStyles/Project.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 61a2c750..f6631329 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -6,6 +6,7 @@