From 2398260afe350e5ccfde19bd6b3ff405774946fa Mon Sep 17 00:00:00 2001 From: Nicolas Kosinski Date: Tue, 7 Jul 2020 22:43:07 +0200 Subject: [PATCH] Do not version IntelliJ IDEA's .idea folder --- .gitignore | 62 +++++++++++++++------------- .idea/codeStyles/codeStyleConfig.xml | 5 --- .idea/compiler.xml | 16 ------- .idea/encodings.xml | 6 --- .idea/jarRepositories.xml | 25 ----------- .idea/misc.xml | 10 ----- .idea/vcs.xml | 11 ----- 7 files changed, 34 insertions(+), 101 deletions(-) delete mode 100644 .idea/codeStyles/codeStyleConfig.xml delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/vcs.xml diff --git a/.gitignore b/.gitignore index 50e6a2f..1d1673a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,10 @@ +/pullpitoK -# Created by https://www.gitignore.io/api/gradle,kotlin,eclipse,intellij,visualstudiocode -# Edit at https://www.gitignore.io/?templates=gradle,kotlin,eclipse,intellij,visualstudiocode -### Eclipse ### +# Created by https://www.toptal.com/developers/gitignore/api/gradle,kotlin,eclipse,intellij+all,visualstudiocode +# Edit at https://www.toptal.com/developers/gitignore?templates=gradle,kotlin,eclipse,intellij+all,visualstudiocode +### Eclipse ### .metadata bin/ tmp/ @@ -54,26 +55,23 @@ local.properties # Annotation Processing .apt_generated/ +.apt_generated_test/ # Scala IDE specific (Scala & Java development for Eclipse) .cache-main .scala_dependencies .worksheet -### Eclipse Patch ### -# Eclipse Core -.project - -# JDT-specific (Eclipse Java Development Tools) -.classpath - -# Annotation Processing -.apt_generated +# Uncomment this line if you wish to ignore the project description file. +# Typically, this file would be tracked if it contains build/dependency configurations: +#.project +### Eclipse Patch ### +# Spring Boot Tooling .sts4-cache/ -### Intellij ### -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm +### Intellij+all ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 # User-specific stuff @@ -103,9 +101,14 @@ local.properties # When using Gradle or Maven with auto-import, you should exclude module files, # since they will be recreated, and may cause churn. Uncomment if using # auto-import. -.idea/modules.xml -.idea/*.iml -.idea/modules +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr # CMake cmake-build-*/ @@ -140,13 +143,18 @@ fabric.properties # Android studio 3.1+ serialized cache file .idea/caches/build_file_checksums.ser -### Intellij Patch ### -# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 +### Intellij+all Patch ### +# Ignores the whole .idea folder and all .iml files +# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360 -# *.iml -# modules.xml -# .idea/misc.xml -# *.ipr +.idea/ + +# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023 + +*.iml +modules.xml +.idea/misc.xml +*.ipr # Sonarlint plugin .idea/sonarlint @@ -182,6 +190,7 @@ hs_err_pid* !.vscode/tasks.json !.vscode/launch.json !.vscode/extensions.json +*.code-workspace ### VisualStudioCode Patch ### # Ignore all local history of files @@ -189,7 +198,7 @@ hs_err_pid* ### Gradle ### .gradle -/build/ +build/ # Ignore Gradle GUI config gradle-app.setting @@ -206,7 +215,4 @@ gradle-app.setting ### Gradle Patch ### **/build/ -# End of https://www.gitignore.io/api/gradle,kotlin,eclipse,intellij,visualstudiocode -/.idea/sonarIssues.xml -/pullpitoK -/libsunec.* +# End of https://www.toptal.com/developers/gitignore/api/gradle,kotlin,eclipse,intellij+all,visualstudiocode diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index a55e7a1..0000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 8144c3c..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index ada92a5..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index dfdae52..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 4555225..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - IDE - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index e22b24b..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file