From 9279941aeba2291340438a1a082ecc355ee7488a Mon Sep 17 00:00:00 2001 From: John Freeman Date: Sat, 5 Oct 2019 16:28:35 +0100 Subject: [PATCH] Updated .gitignore config For better IntelliJ Git config. --- .gitignore | 141 +++++++++++++++++++++++++++-------------- .idea/modules.xml | 8 --- doxia-sink-api-ktx.iml | 83 ------------------------ 3 files changed, 92 insertions(+), 140 deletions(-) delete mode 100644 .idea/modules.xml delete mode 100644 doxia-sink-api-ktx.iml diff --git a/.gitignore b/.gitignore index 26f5864..f4352d2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ # Created by https://www.gitignore.io/api/windows,linux,osx,vim,emacs,visualstudiocode,intellij,eclipse,netbeans,maven,java +# Edit at https://www.gitignore.io/?templates=windows,linux,osx,vim,emacs,visualstudiocode,intellij,eclipse,netbeans,maven,java ### Eclipse ### - .metadata bin/ tmp/ @@ -26,6 +26,9 @@ local.properties # CDT-specific (C/C++ Development Tooling) .cproject +# CDT- autotools +.autotools + # Java annotation processor (APT) .factorypath @@ -47,6 +50,9 @@ local.properties # Code Recommenders .recommenders/ +# Annotation Processing +.apt_generated/ + # Scala IDE specific (Scala & Java development for Eclipse) .cache-main .scala_dependencies @@ -62,6 +68,8 @@ local.properties # Annotation Processing .apt_generated +.sts4-cache/ + ### Emacs ### # -*- mode: gitignore; -*- *~ @@ -105,64 +113,62 @@ flycheck_*.el # projectiles files .projectile -projectile-bookmarks.eld # directory configuration .dir-locals.el -# saveplace -places - -# url cache -url/cache/ - -# cedet -ede-projects.el +# network security +/network-security.data -# smex -smex-items - -# company-statistics -company-statistics-cache.el - -# anaconda-mode -anaconda-mode/ ### Intellij ### -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 -# User-specific stuff: +# User-specific stuff .idea/**/workspace.xml .idea/**/tasks.xml -.idea/dictionaries +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# Generated files +.idea/**/contentModel.xml -# Sensitive or high-churn files: +# Sensitive or high-churn files .idea/**/dataSources/ .idea/**/dataSources.ids -.idea/**/dataSources.xml .idea/**/dataSources.local.xml .idea/**/sqlDataSources.xml .idea/**/dynamic.xml .idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml -# Gradle: +# 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/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + # CMake -cmake-build-debug/ +cmake-build-*/ -# Mongo Explorer plugin: +# Mongo Explorer plugin .idea/**/mongoSettings.xml -## File-based project format: +# File-based project format *.iws -## Plugin-specific files: - # IntelliJ -/out/ +out/ # mpeltonen/sbt-idea plugin .idea_modules/ @@ -173,15 +179,18 @@ atlassian-ide-plugin.xml # Cursive Clojure plugin .idea/replstate.xml -# Ruby plugin and RubyMine -/.rakeTasks - # 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 @@ -191,7 +200,14 @@ fabric.properties # *.ipr # Sonarlint plugin -.idea/sonarlint +.idea/**/sonarlint/ + +# SonarQube Plugin +.idea/**/sonarIssues.xml + +# Markdown Navigator plugin +.idea/**/markdown-navigator.xml +.idea/**/markdown-navigator/ ### Java ### # Compiled class file @@ -209,6 +225,7 @@ fabric.properties # Package Files # *.jar *.war +*.nar *.ear *.zip *.tar.gz @@ -241,20 +258,21 @@ release.properties dependency-reduced-pom.xml buildNumber.properties .mvn/timing.properties - -# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored) -!/.mvn/wrapper/maven-wrapper.jar +.mvn/wrapper/maven-wrapper.jar +.flattened-pom.xml ### NetBeans ### -nbproject/private/ +**/nbproject/private/ +**/nbproject/Makefile-*.mk +**/nbproject/Package-*.bash build/ nbbuild/ nbdist/ .nb-gradle/ -nbactions.xml ### OSX ### -*.DS_Store +# General +.DS_Store .AppleDouble .LSOverride @@ -281,15 +299,23 @@ Temporary Items .apdisk ### Vim ### -# swap -.sw[a-p] -.*.sw[a-p] -# session +# Swap +[._]*.s[a-v][a-z] +[._]*.sw[a-p] +[._]s[a-rt-v][a-z] +[._]ss[a-gi-z] +[._]sw[a-p] + +# Session Session.vim -# temporary +Sessionx.vim + +# Temporary .netrwhist -# auto-generated tag files +# Auto-generated tag files tags +# Persistent undo +[._]*.un~ ### VisualStudioCode ### .vscode/* @@ -297,16 +323,23 @@ tags !.vscode/tasks.json !.vscode/launch.json !.vscode/extensions.json + +### VisualStudioCode Patch ### +# Ignore all local history of files .history ### Windows ### # Windows thumbnail cache files Thumbs.db +Thumbs.db:encryptable ehthumbs.db ehthumbs_vista.db +# Dump file +*.stackdump + # Folder config file -Desktop.ini +[Dd]esktop.ini # Recycle Bin used on file shares $RECYCLE.BIN/ @@ -314,16 +347,26 @@ $RECYCLE.BIN/ # Windows Installer files *.cab *.msi +*.msix *.msm *.msp # Windows shortcuts *.lnk - # End of https://www.gitignore.io/api/windows,linux,osx,vim,emacs,visualstudiocode,intellij,eclipse,netbeans,maven,java ### Project additions ### -.flattened-pom.xml +# 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/modules.xml +.idea/*.iml +.idea/modules +*.iml +*.ipr + +# Non-java project /.idea/checkstyle-idea.xml diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index b12906f..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/doxia-sink-api-ktx.iml b/doxia-sink-api-ktx.iml deleted file mode 100644 index 6760b5c..0000000 --- a/doxia-sink-api-ktx.iml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file