From 19f81df3c49afb80743957dccf142844f509135c Mon Sep 17 00:00:00 2001 From: Giuseppe Barbieri Date: Tue, 17 Nov 2020 17:13:43 +0100 Subject: [PATCH 1/3] - pimped `.gitignore` with [`https://www.toptal.com/developers/gitignore/api/java,gradle,intellij,kotlin,maven`](https://www.toptal.com/developers/gitignore/api/java,gradle,intellij,kotlin,maven) - preserved the original one (with few modifications) - added exclusion for `.mvn/.gradle-enterprise` (still no idea where this comes from) - added some safe .idea [files](https://intellij-support.jetbrains.com/hc/en-us/articles/206544839-How-to-manage-projects-under-Version-Control-Systems) --- .gitignore | 189 +++++++++++++++++++++++++++++++++++++++++++- .idea/encodings.xml | 7 ++ .idea/misc.xml | 11 +++ .idea/vcs.xml | 6 ++ 4 files changed, 209 insertions(+), 4 deletions(-) create mode 100644 .idea/encodings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/vcs.xml diff --git a/.gitignore b/.gitignore index cccdd05d..9cbb076a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,185 @@ -# Maven # +# Created by https://www.toptal.com/developers/gitignore/api/java,gradle,intellij,kotlin,maven +# Edit at https://www.toptal.com/developers/gitignore?templates=java,gradle,intellij,kotlin,maven + +### Intellij ### +# 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 +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# 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/artifacts +.idea/compiler.xml +.idea/jarRepositories.xml +.idea/modules.xml +.idea/*.iml +.idea/modules +*.iml +*.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# 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 + +# *.iml +# modules.xml +# .idea/misc.xml +# *.ipr + +# Sonarlint plugin +# https://plugins.jetbrains.com/plugin/7973-sonarlint +.idea/**/sonarlint/ + +# SonarQube Plugin +# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin +.idea/**/sonarIssues.xml + +# Markdown Navigator plugin +# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced +.idea/**/markdown-navigator.xml +.idea/**/markdown-navigator-enh.xml +.idea/**/markdown-navigator/ + +# Cache file creation bug +# See https://youtrack.jetbrains.com/issue/JBR-2257 +.idea/$CACHE_FILE$ + +# CodeStream plugin +# https://plugins.jetbrains.com/plugin/12206-codestream +.idea/codestream.xml + +### Java ### +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +### Kotlin ### +# Compiled class file + +# Log file + +# BlueJ files + +# Mobile Tools for Java (J2ME) + +# Package Files # + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml + +### Maven ### +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +# https://github.com/takari/maven-wrapper#usage-without-binary-jar +.mvn/wrapper/maven-wrapper.jar + +### Gradle ### +.gradle +build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +# Cache of project +.gradletasknamecache + +# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 +# gradle/wrapper/gradle-wrapper.properties + +### Gradle Patch ### +**/build/ + +# End of https://www.toptal.com/developers/gitignore/api/java,gradle,intellij,kotlin,maven + +# https://docs.gradle.com/enterprise/maven-extension/ +.mvn/.gradle-enterprise + +# original .gitignore, commented out duplicates and wrong exclusions# Maven # /target/ # Eclipse # @@ -7,9 +188,9 @@ /.settings/ # IntelliJ -.idea/ -*.ipr -*.iml +#.idea/ Wrong +#*.ipr Duplicate +#*.iml Duplicate # Vim .*.swp diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 00000000..aa00ffab --- /dev/null +++ b/.idea/encodings.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..7f20f295 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,11 @@ + + + + + + + \ 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 6b80ff4d62e71a842d8d569415100f863cd5a09e Mon Sep 17 00:00:00 2001 From: Giuseppe Barbieri Date: Tue, 17 Nov 2020 17:15:15 +0100 Subject: [PATCH 2/3] fixed comment --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9cbb076a..a856fa67 100644 --- a/.gitignore +++ b/.gitignore @@ -179,7 +179,9 @@ gradle-app.setting # https://docs.gradle.com/enterprise/maven-extension/ .mvn/.gradle-enterprise -# original .gitignore, commented out duplicates and wrong exclusions# Maven # +# original .gitignore, commented out duplicates and wrong exclusions + +# Maven # /target/ # Eclipse # From fa2d4775c5eb69911c6aaeb50bc78401d663f3d0 Mon Sep 17 00:00:00 2001 From: Giuseppe Barbieri Date: Wed, 2 Dec 2020 12:12:50 +0100 Subject: [PATCH 3/3] removed .idea/ --- .gitignore | 2 +- .idea/encodings.xml | 7 ------- .idea/misc.xml | 11 ----------- .idea/vcs.xml | 6 ------ 4 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/vcs.xml diff --git a/.gitignore b/.gitignore index a856fa67..afe337c2 100644 --- a/.gitignore +++ b/.gitignore @@ -190,7 +190,7 @@ gradle-app.setting /.settings/ # IntelliJ -#.idea/ Wrong +.idea/ #*.ipr Duplicate #*.iml Duplicate diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index aa00ffab..00000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 7f20f295..00000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file