From 64328fda83e705843362e2f8163c947066d29e06 Mon Sep 17 00:00:00 2001 From: John Freeman Date: Sun, 21 Aug 2022 14:08:38 +0100 Subject: [PATCH] Updated Git config For new IntelliJ version. --- .gitattributes | 4 +++ .gitignore | 75 ++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 68 insertions(+), 11 deletions(-) diff --git a/.gitattributes b/.gitattributes index c9403ac4..91fd8629 100644 --- a/.gitattributes +++ b/.gitattributes @@ -28,12 +28,14 @@ # Explicitly declare text files you want to always be normalized and converted # to native line endings on checkout. +.editorconfig text .gitignore text .gitattributes text *.xml text *.yml text *.yaml text *.json text +*.toml text *.txt text *.md text *.htm text @@ -45,6 +47,7 @@ *.kt text *.kts text *.properties text +LICENSE text # Declare files that will always have CRLF line endings on checkout. *.bat text eol=crlf @@ -52,6 +55,7 @@ # Declare files that will always have LF line endings on checkout. *.sh text eol=lf +mvnw text eol=lf # Denote all files that are truly binary and should not be modified. *.png binary diff --git a/.gitignore b/.gitignore index 428a0d4c..bd27e052 100644 --- a/.gitignore +++ b/.gitignore @@ -52,22 +52,19 @@ 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/ ### Emacs ### @@ -122,7 +119,7 @@ flycheck_*.el ### 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, WebStorm and Rider # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 # User-specific stuff @@ -132,6 +129,9 @@ flycheck_*.el .idea/**/dictionaries .idea/**/shelf +# AWS User-specific +.idea/**/aws.xml + # Generated files .idea/**/contentModel.xml @@ -152,6 +152,9 @@ flycheck_*.el # 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 @@ -179,6 +182,9 @@ atlassian-ide-plugin.xml # Cursive Clojure plugin .idea/replstate.xml +# SonarLint plugin +.idea/sonarlint/ + # Crashlytics plugin (for Android Studio and IntelliJ) com_crashlytics_export_strings.xml crashlytics.properties @@ -200,15 +206,31 @@ fabric.properties # *.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 + +# Azure Toolkit for IntelliJ plugin +# https://plugins.jetbrains.com/plugin/8053-azure-toolkit-for-intellij +.idea/**/azureSettings.xml + ### Java ### # Compiled class file *.class @@ -233,6 +255,7 @@ fabric.properties # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* +replay_pid* ### Linux ### @@ -258,8 +281,14 @@ 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 -.flattened-pom.xml + +# Eclipse m2e generated files +# Eclipse Core +.project +# JDT-specific (Eclipse Java Development Tools) +.classpath ### NetBeans ### **/nbproject/private/ @@ -279,6 +308,7 @@ nbdist/ # Icon must end with two \r Icon + # Thumbnails ._* @@ -301,6 +331,7 @@ Temporary Items ### Vim ### # Swap [._]*.s[a-v][a-z] +!*.svg # comment out if you don't need vector files [._]*.sw[a-p] [._]s[a-rt-v][a-z] [._]ss[a-gi-z] @@ -323,10 +354,24 @@ tags !.vscode/tasks.json !.vscode/launch.json !.vscode/extensions.json +!.vscode/*.code-snippets + +# Local History for Visual Studio Code +.history/ + +# Built Visual Studio Code Extensions +*.vsix ### VisualStudioCode Patch ### # Ignore all local history of files .history +.ionide + +# Support for Project snippet scope +.vscode/*.code-snippets + +# Ignore code-workspaces +*.code-workspace ### Windows ### # Windows thumbnail cache files @@ -362,10 +407,18 @@ $RECYCLE.BIN/ # 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 +# Flattened POM +.flattened-pom.xml + +# Non-Java project /.idea/checkstyle-idea.xml +/.idea/google-java-format.xml