From 9b1079fc9ea46fbdc7891a671f6e22552271534b Mon Sep 17 00:00:00 2001
From: Charles <charles.tian23@gmail.com>
Date: Wed, 9 Mar 2022 14:30:04 -0500
Subject: [PATCH 1/2] Update .gitignore

---
 .gitignore | 41 ++++++++++-------------------------------
 1 file changed, 10 insertions(+), 31 deletions(-)

diff --git a/.gitignore b/.gitignore
index bb6756587..015c424bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
-# Created by https://www.toptal.com/developers/gitignore/api/intellij,gradle,java
-# Edit at https://www.toptal.com/developers/gitignore?templates=intellij,gradle,java
+# Created by https://www.toptal.com/developers/gitignore/api/intellij+all,gradle,java
+# Edit at https://www.toptal.com/developers/gitignore?templates=intellij+all,gradle,java
 
-### Intellij ###
+### 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
 
@@ -80,35 +80,14 @@ 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 ###
+# Ignore everything but code style settings and run configurations
+# that are supposed to be shared within teams.
 
-# *.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$
+.idea/*
 
-# CodeStream plugin
-# https://plugins.jetbrains.com/plugin/12206-codestream
-.idea/codestream.xml
+!.idea/codeStyles
+!.idea/runConfigurations
 
 ### Java ###
 # Compiled class file
@@ -159,4 +138,4 @@ gradle-app.setting
 # JDT-specific (Eclipse Java Development Tools)
 .classpath
 
-# End of https://www.toptal.com/developers/gitignore/api/intellij,gradle,java
+# End of https://www.toptal.com/developers/gitignore/api/intellij+all,gradle,java
\ No newline at end of file

From c822ccf7aef98cecb833236eafd81f96801019d8 Mon Sep 17 00:00:00 2001
From: Charles <charles.tian23@gmail.com>
Date: Wed, 9 Mar 2022 14:37:34 -0500
Subject: [PATCH 2/2] Adjust .gitignore

---
 .idea/compiler.xml                            |  6 --
 .idea/encodings.xml                           |  6 --
 .idea/jarRepositories.xml                     | 20 -----
 .idea/modules.xml                             |  9 --
 .idea/modules/Legup.test.iml                  | 82 -------------------
 .../legup-update/Legup.legup-update.test.iml  | 19 -----
 .idea/runConfigurations.xml                   | 10 ---
 7 files changed, 152 deletions(-)
 delete mode 100644 .idea/compiler.xml
 delete mode 100644 .idea/encodings.xml
 delete mode 100644 .idea/jarRepositories.xml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/modules/Legup.test.iml
 delete mode 100644 .idea/modules/legup-update/Legup.legup-update.test.iml
 delete mode 100644 .idea/runConfigurations.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 61a9130cd..000000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 6e4adc023..000000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/src/main/java/edu/rpi/legup/puzzle/skyscrapers/rules/NEdgeBasicRule.java" charset="windows-1252" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
deleted file mode 100644
index fdc392fe8..000000000
--- a/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="MavenRepo" />
-      <option name="name" value="MavenRepo" />
-      <option name="url" value="https://repo.maven.apache.org/maven2/" />
-    </remote-repository>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 75f4375f6..000000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/legup-update/Legup.legup-update.test.iml" filepath="$PROJECT_DIR$/.idea/modules/legup-update/Legup.legup-update.test.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/Legup.test.iml" filepath="$PROJECT_DIR$/.idea/modules/Legup.test.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/modules/Legup.test.iml b/.idea/modules/Legup.test.iml
deleted file mode 100644
index 263be0803..000000000
--- a/.idea/modules/Legup.test.iml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="Legup:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="2.0.0" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <output-test url="file://$MODULE_DIR$/../../build/classes/java/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../src/test">
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" type="java-test-resource" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="Legup.main" />
-    <orderEntry type="module" module-name="Legup.legup-update.main" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-admin:6.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpclient:4.5.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-simple:1.7.25" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.7" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.10.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.10.0" level="project" />
-    <orderEntry type="library" name="Gradle: junit:junit:4.13.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.2" level="project" />
-    <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
-    <orderEntry type="library" name="Gradle: commons-io:commons-io:2.6" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.api-client:google-api-client-gson:1.23.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.cloud:google-cloud-storage:1.27.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.api-client:google-api-client:1.23.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.cloud:google-cloud-firestore:0.45.0-beta" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.auth:google-auth-library-oauth2-http:0.9.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.http-client:google-http-client:1.23.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.api:api-common:1.5.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.guava:guava:20.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.json:json:20160810" level="project" />
-    <orderEntry type="library" name="Gradle: io.netty:netty-codec-http:4.1.22.Final" level="project" />
-    <orderEntry type="library" name="Gradle: io.netty:netty-handler:4.1.22.Final" level="project" />
-    <orderEntry type="library" name="Gradle: io.netty:netty-transport:4.1.22.Final" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.httpcomponents:httpcore:4.4.3" level="project" />
-    <orderEntry type="library" name="Gradle: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Gradle: commons-codec:commons-codec:1.9" level="project" />
-    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.http-client:google-http-client-gson:1.23.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.cloud:google-cloud-core-http:1.27.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.cloud:google-cloud-core:1.27.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.apis:google-api-services-storage:v1-rev114-1.23.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.http-client:google-http-client-jackson2:1.23.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.oauth-client:google-oauth-client:1.23.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.guava:guava-jdk5:17.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.cloud:google-cloud-core-grpc:1.27.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.api:gax-grpc:1.23.0" level="project" />
-    <orderEntry type="library" name="Gradle: io.grpc:grpc-stub:1.10.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.grpc:grpc-auth:1.10.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.api.grpc:proto-google-cloud-firestore-v1beta1:0.10.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.auto.value:auto-value:1.4" level="project" />
-    <orderEntry type="library" name="Gradle: io.grpc:grpc-netty-shaded:1.10.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.auth:google-auth-library-credentials:0.9.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.code.findbugs:jsr305:3.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.netty:netty-codec:4.1.22.Final" level="project" />
-    <orderEntry type="library" name="Gradle: io.netty:netty-buffer:4.1.22.Final" level="project" />
-    <orderEntry type="library" name="Gradle: io.netty:netty-resolver:4.1.22.Final" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.api:gax-httpjson:0.40.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.http-client:google-http-client-appengine:1.23.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.http-client:google-http-client-jackson:1.23.0" level="project" />
-    <orderEntry type="library" name="Gradle: io.opencensus:opencensus-contrib-http-util:0.11.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.opencensus:opencensus-api:0.11.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.api:gax:1.23.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.protobuf:protobuf-java-util:3.5.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.api.grpc:proto-google-iam-v1:0.10.0" level="project" />
-    <orderEntry type="library" name="Gradle: joda-time:joda-time:2.9.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.api.grpc:proto-google-common-protos:1.9.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.1.3" level="project" />
-    <orderEntry type="library" name="Gradle: io.grpc:grpc-protobuf:1.10.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.protobuf:protobuf-java:3.5.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.grpc:grpc-context:1.10.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.threeten:threetenbp:1.3.3" level="project" />
-    <orderEntry type="library" name="Gradle: io.grpc:grpc-core:1.10.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.netty:netty-common:4.1.22.Final" level="project" />
-    <orderEntry type="library" name="Gradle: org.codehaus.jackson:jackson-core-asl:1.9.11" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.errorprone:error_prone_annotations:2.2.0" level="project" />
-    <orderEntry type="library" name="Gradle: io.grpc:grpc-protobuf-lite:1.10.1" level="project" />
-    <orderEntry type="library" name="Gradle: io.opencensus:opencensus-contrib-grpc-metrics:0.11.0" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules/legup-update/Legup.legup-update.test.iml b/.idea/modules/legup-update/Legup.legup-update.test.iml
deleted file mode 100644
index 562d770d7..000000000
--- a/.idea/modules/legup-update/Legup.legup-update.test.iml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":legup-update:test" external.linked.project.path="$MODULE_DIR$/../../../legup-update" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="Legup" external.system.module.type="sourceSet" external.system.module.version="2.0" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <output-test url="file://$MODULE_DIR$/../../../legup-update/build/classes/java/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../../legup-update/src/test" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="Legup.legup-update.main" />
-    <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.2" level="project" />
-    <orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.4" level="project" />
-    <orderEntry type="library" name="Gradle: commons-io:commons-io:2.6" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.7" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-core:2.10.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.apache.logging.log4j:log4j-api:2.10.0" level="project" />
-    <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 797acea53..000000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file