From 98a92a020a0cdf21cafec1ea6d3346c5d6f9464d Mon Sep 17 00:00:00 2001 From: Michael Plump Date: Fri, 28 Jun 2019 11:46:06 -0400 Subject: [PATCH] chore(intellij): Add IDEA project files. (#586) --- .idea/README.md | 10 ++++++++++ .idea/compiler.xml | 8 ++++++++ .idea/copyright/ALS2.xml | 6 ++++++ .idea/copyright/profiles_settings.xml | 3 +++ .idea/google-java-format.xml | 6 ++++++ .idea/gradle.xml | 12 ++++++++++++ .idea/vcs.xml | 6 ++++++ gradle.properties | 2 +- 8 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 .idea/README.md create mode 100644 .idea/compiler.xml create mode 100644 .idea/copyright/ALS2.xml create mode 100644 .idea/copyright/profiles_settings.xml create mode 100644 .idea/google-java-format.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/README.md b/.idea/README.md new file mode 100644 index 000000000..791237770 --- /dev/null +++ b/.idea/README.md @@ -0,0 +1,10 @@ +# Spinnaker IntelliJ IDEA files + +IntelliJ IDEA will modify some of these files from their checked-in versions when the project is +opened. To work around this, the Spinnaker Gradle plugin will mark these files in Git as "assume +unchanged", telling Git to ignore any local changes. If you want to commit changes to these files, +you will need to undo that. + +```bash +$ git update-index --no-assume-unchanged $FILENAME +``` diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 000000000..a1757ae52 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/ALS2.xml b/.idea/copyright/ALS2.xml new file mode 100644 index 000000000..2f6849bb3 --- /dev/null +++ b/.idea/copyright/ALS2.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 000000000..5c6994bea --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/google-java-format.xml b/.idea/google-java-format.xml new file mode 100644 index 000000000..4a0e553c7 --- /dev/null +++ b/.idea/google-java-format.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 000000000..4aa6c33c7 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 000000000..35eb1ddfb --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index dfab9b17f..7e3236bb8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,5 +2,5 @@ fiatVersion=1.1.0 enablePublishing=false korkVersion=5.5.2 -spinnakerGradleVersion=6.5.0 +spinnakerGradleVersion=6.7.0 org.gradle.parallel=true