From 37429bbd6f589bab5f48339f095749b7f0309648 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 3 Apr 2023 14:01:53 -0600
Subject: [PATCH 1/8] remove vscode
---
.gitignore | 1 -
1 file changed, 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index afda252de..d4c5e0c3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
.project
.settings
.gradle
-.vscode
bin
build
classes
--
GitLab
From 922633c1c3b6d2486235585e61732d1864dc4740 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 3 Apr 2023 14:02:03 -0600
Subject: [PATCH 2/8] Add extension file
---
.vscode/extensions.json | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 .vscode/extensions.json
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 000000000..f5397ad34
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,17 @@
+{
+ /*
+ * VS Code recommended extensions for nshmp-haz.
+ *
+ * For more information on extension,
+ * visit: https://code.visualstudio.com/docs/editor/extension-marketplace
+ */
+ "recommendations": [
+ "davidanson.vscode-markdownlint",
+ "editorconfig.editorconfig",
+ "gitlab.gitlab-workflow",
+ "jumpinjackie.vscode-map-preview",
+ "redhat.vscode-yaml",
+ "vscjava.vscode-gradle",
+ "vscjava.vscode-java-pack",
+ ]
+}
--
GitLab
From 9c7e6848f93b317abc0ae8f0c276ee1fd19ddfd0 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 3 Apr 2023 14:02:10 -0600
Subject: [PATCH 3/8] Add settings file
---
.vscode/settings.json | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 .vscode/settings.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..c32ef434c
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,31 @@
+{
+ /*
+ * VS Code settings for nshmp-haz.
+ *
+ * For more information on settings,
+ * visit: https://code.visualstudio.com/docs/getstarted/settings
+ */
+ "editor.rulers": [
+ {
+ "column": 100
+ }
+ ],
+ "editor.tabSize": 2,
+ "files.associations": {
+ "*.geojson": "json"
+ },
+ "java.compile.nullAnalysis.mode": "automatic",
+ "java.configuration.updateBuildConfiguration": "automatic",
+ "java.import.generatesMetadataFilesAtProjectRoot": true,
+ "files.exclude": {
+ "**/.classpath": true,
+ "**/.DS_Store": true,
+ "**/.factorypath": true,
+ "**/.git": true,
+ "**/.gradle": true,
+ "**/.project": true,
+ "**/.settings": true,
+ "**/bin": true,
+ "**/node_modules": true,
+ }
+}
--
GitLab
From 356b2f894cd53057ee57cdbd2eefc222552a196f Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 3 Apr 2023 14:02:16 -0600
Subject: [PATCH 4/8] Add tasks file
---
.vscode/tasks.json | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 .vscode/tasks.json
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 000000000..99096d8e0
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,29 @@
+{
+ /*
+ * VS Code tasks for nshmp-haz.
+ *
+ * For more information on tasks, visit: https://code.visualstudio.com/docs/editor/tasks
+ */
+ "version": "2.0.0",
+ "tasks": [
+ /*
+ * Task to automatically run the `./gradlew eclipse` task on startup to
+ * keep the `.classpath` file updated.
+ */
+ {
+ "label": "Update Classpath File",
+ "type": "shell",
+ "command": "./gradlew eclipse",
+ "windows": {
+ "command": "gradle.bat eclipse"
+ },
+ "presentation": {
+ "close": true,
+ },
+ "group": "none",
+ "runOptions": {
+ "runOn": "folderOpen"
+ }
+ }
+ ]
+}
--
GitLab
From d6698fd81bd8865f32c71dc624d589755bdbfe0b Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 3 Apr 2023 14:06:09 -0600
Subject: [PATCH 5/8] Cleanup ext gradle
---
gradle/ext.gradle | 63 -----------------------------------------------
1 file changed, 63 deletions(-)
diff --git a/gradle/ext.gradle b/gradle/ext.gradle
index 9e5681622..5da88c0dc 100644
--- a/gradle/ext.gradle
+++ b/gradle/ext.gradle
@@ -9,67 +9,4 @@ ext {
nshmpLibGradleDir = "${nshmpLib}/gradle"
spotbugsDir = "${nshmpLib}/gradle"
spotlessDir = "${nshmpLib}/src/main/resources"
-
- /* Multi-model repository paths for version tracking */
- repo_cous_2008 = '../nshm-cous-2008'
- repo_cous_2014 = '../nshm-cous-2014'
- repo_cous_2014b = '../nshm-cous-2014b'
- repo_cous_2018 = '../nshm-cous-2018'
- repo_hi_2020 = '../nshm-hi-2020'
- repo_ak_2007 = '../nshm-ak-2007'
-
- /* Explicit model paths */
- model_wus_2008 = "${repo_cous_2008}/Western US"
- model_ceus_2008 = "${repo_cous_2008}/Central & Eastern US"
- model_wus_2014 = "${repo_cous_2014}/Western US"
- model_ceus_2014 = "${repo_cous_2014}/Central & Eastern US"
- model_wus_2014b = "${repo_cous_2014b}/Western US"
- model_wus_2018 = "${repo_cous_2018}/Western US"
- model_ceus_2018 = "${repo_cous_2018}/Central & Eastern US"
- model_hi_2020 = "${repo_hi_2020}"
- model_ak_2007 = "${repo_ak_2007}"
-
- /* Production models */
- prod_models = [
- [
- model_ak_2007,
- 'models/ak/2007'
- ],
- [
- model_ceus_2008,
- 'models/ceus/2008'
- ],
- [
- model_wus_2008,
- 'models/wus/2008'
- ],
- [
- model_ceus_2014,
- 'models/ceus/2014'
- ],
- [
- model_wus_2014,
- 'models/wus/2014'
- ],
- [
- model_wus_2014b,
- 'models/wus/2014b'
- ]
- ]
-
- /* Development models */
- dev_models = [
- [
- model_ceus_2018,
- 'models/ceus/2018'
- ],
- [
- model_wus_2018,
- 'models/wus/2018'
- ],
- [
- model_hi_2020,
- 'models/hi/2020'
- ]
- ]
}
--
GitLab
From 76d3e72d406609ce510ecb05c25d6f4a66e992e4 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 3 Apr 2023 14:06:58 -0600
Subject: [PATCH 6/8] update package
---
package-lock.json | 1 +
1 file changed, 1 insertion(+)
diff --git a/package-lock.json b/package-lock.json
index fd03b78e3..dc72624ba 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,6 +5,7 @@
"requires": true,
"packages": {
"": {
+ "name": "nshmp-haz",
"version": "2.0.0",
"devDependencies": {
"markdownlint-cli": "^0.31.1",
--
GitLab
From 2da9d544f8e9beee8a439ec08b5c8ef5644f3fa2 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 3 Apr 2023 14:18:06 -0600
Subject: [PATCH 7/8] cleanup
---
.vscode/extensions.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index f5397ad34..5998446b3 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -5,7 +5,7 @@
* For more information on extension,
* visit: https://code.visualstudio.com/docs/editor/extension-marketplace
*/
- "recommendations": [
+ "recommendations": [
"davidanson.vscode-markdownlint",
"editorconfig.editorconfig",
"gitlab.gitlab-workflow",
--
GitLab
From 7c88566850e1d7329986bf4febd3906ff8b1e072 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Tue, 4 Apr 2023 09:08:40 -0600
Subject: [PATCH 8/8] add shell check
---
.vscode/extensions.json | 1 +
1 file changed, 1 insertion(+)
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 5998446b3..c29927f2c 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -11,6 +11,7 @@
"gitlab.gitlab-workflow",
"jumpinjackie.vscode-map-preview",
"redhat.vscode-yaml",
+ "timonwong.shellcheck",
"vscjava.vscode-gradle",
"vscjava.vscode-java-pack",
]
--
GitLab