Merge pull request #286 from JasonHHouse/improvements/package_updates

Improvements/package updates
JasonHHouse · Jan 15, 2022 · 11dc31b · 11dc31b
2 parents d8be759 + 2e0634a
commit 11dc31b
Show file tree

Hide file tree

Showing 19 changed files with 515 additions and 581 deletions.
diff --git a/.run/Gaps Dev.run.xml b/.run/Gaps Dev.run.xml
@@ -6,57 +6,8 @@
         <option name="removeVolumesOnComposeDown" value="true" />
         <option name="commandLineOptions" value="--build" />
         <option name="sourceFilePath" value="docker-compose-dev.yaml" />
-        <option name="upExitCodeFromService" value="" />
-        <option name="upTimeout" value="" />
       </settings>
     </deployment>
-    <method v="2">
-      <option name="NpmBeforeRunTask" enabled="true">
-        <package-json value="$PROJECT_DIR$/package.json" />
-        <command value="run" />
-        <scripts>
-          <script value="minify-input-css" />
-        </scripts>
-        <node-interpreter value="project" />
-        <envs />
-      </option>
-      <option name="NpmBeforeRunTask" enabled="true">
-        <package-json value="$PROJECT_DIR$/package.json" />
-        <command value="run" />
-        <scripts>
-          <script value="uglifyjs-modules" />
-        </scripts>
-        <node-interpreter value="project" />
-        <envs />
-      </option>
-      <option name="NpmBeforeRunTask" enabled="true">
-        <package-json value="$PROJECT_DIR$/package.json" />
-        <command value="run" />
-        <scripts>
-          <script value="uglifyjs-pages" />
-        </scripts>
-        <node-interpreter value="project" />
-        <envs />
-      </option>
-      <option name="NpmBeforeRunTask" enabled="true">
-        <package-json value="$PROJECT_DIR$/package.json" />
-        <command value="run" />
-        <scripts>
-          <script value="eslint-cypress" />
-        </scripts>
-        <node-interpreter value="project" />
-        <envs />
-      </option>
-      <option name="NpmBeforeRunTask" enabled="true">
-        <package-json value="$PROJECT_DIR$/package.json" />
-        <command value="run" />
-        <scripts>
-          <script value="eslint-gaps" />
-        </scripts>
-        <node-interpreter value="project" />
-        <envs />
-      </option>
-      <option name="Maven.BeforeRunTask" enabled="true" file="$PROJECT_DIR$/pom.xml" goal="clean install" />
-    </method>
+    <method v="2" />
   </configuration>
 </component>
diff --git a/Core/pom.xml b/Core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>Gaps</artifactId>
         <groupId>com.jasonhhouse</groupId>
-        <version>0.9.12</version>
+        <version>0.9.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/Dockerfile b/Dockerfile
@@ -32,7 +32,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/app
 
 WORKDIR /usr/app
 
-COPY GapsWeb/target/GapsWeb-0.9.12.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.9.13.jar /usr/app/gaps.jar
 
 COPY start.sh /usr/app/
 

diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -35,7 +35,6 @@ ENTRYPOINT  java  \
             -XX:+UseG1GC  \
             -XX:+HeapDumpOnOutOfMemoryError   \
             -XX:+UseStringDeduplication   \
-            -XX:+UseStringCache   \
             -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 \
             -jar  \
             -Dserver.servlet.context-path=${baseUrl} \

diff --git a/Dockerfile.riscv64 b/Dockerfile.riscv64
@@ -36,7 +36,7 @@ RUN mkdir -p /usr/app && chmod 777 /usr/app
 
 WORKDIR /usr/app
 
-COPY GapsWeb/target/GapsWeb-0.9.12.jar /usr/app/gaps.jar
+COPY GapsWeb/target/GapsWeb-0.9.13.jar /usr/app/gaps.jar
 
 COPY start.sh /usr/app/
 

diff --git a/GapsAsJar/gaps.nsi b/GapsAsJar/gaps.nsi
@@ -48,4 +48,4 @@ RMDIR /r $INSTDIR
 SectionEnd
 
 # name the installer
-OutFile "gaps-0.9.12-installer.exe"
+OutFile "gaps-0.9.13-installer.exe"
diff --git a/GapsWeb/pom.xml b/GapsWeb/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>Gaps</artifactId>
         <groupId>com.jasonhhouse</groupId>
-        <version>0.9.12</version>
+        <version>0.9.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/GapsWeb/src/main/resources/application.yaml b/GapsWeb/src/main/resources/application.yaml
@@ -42,7 +42,7 @@ info:
   app:
     name: Gaps
     description: Gaps searches through your Plex Server for all movies, then queries for known movies in the same collection. If those movies don't exist in your library, Gaps will recommend getting those movies, legally of course.
-    version: 0.9.12
+    version: 0.9.13
     storageFolder: /usr/data
     properties:
       rssFeed: rssFeed.json

diff --git a/GapsWeb/src/main/resources/templates/about.html b/GapsWeb/src/main/resources/templates/about.html
@@ -29,7 +29,7 @@
     <img loading="lazy" th:src="@{/images/final-2.svg}" alt="Gaps Logo" style="width:50%;height:50%;" class="center">
 
     <h3 class="top-margin">About</h3>
-    <h4 class="top-margin text-primary">v0.9.12</h4>
+    <h4 class="top-margin text-primary">v0.9.13</h4>
 
     <p class="text-muted">Gaps searches through your Plex Server. It then queries
         for known

diff --git a/GapsWeb/src/main/resources/templates/index.html b/GapsWeb/src/main/resources/templates/index.html
@@ -27,7 +27,7 @@
 <div class="container bottom-margin">
     <img loading="lazy" th:src="@{/images/final-2.svg}" alt="Gaps Logo" style="width:50%;height:50%;" class="center">
 
-    <h3 class="top-margin">v0.9.12</h3>
+    <h3 class="top-margin">v0.9.13</h3>
 
     <p class="text-muted">Gaps searches through your Plex Server. It then queries
         for known

diff --git a/GapsWeb/src/main/resources/templates/updates.html b/GapsWeb/src/main/resources/templates/updates.html
@@ -28,6 +28,12 @@
     <img loading="lazy" th:src="@{/images/final-2.svg}" alt="Gaps Logo" style="width:50%;height:50%;" class="center">
 
     <h3 class="top-margin">Updates</h3>
+    <h4 class="top-margin text-primary">v0.9.13</h4>
+    <ul class="text-muted">
+        <li>NPM and Maven Version Updates</li>
+        <li>Fixed broken dev build</li>
+    </ul>
+
     <h4 class="top-margin text-primary">v0.9.12</h4>
     <ul class="text-muted">
         <li>Fixed bug when empty text caused date parsing crash on upcoming movies</li>

diff --git a/Plex/pom.xml b/Plex/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>Gaps</artifactId>
         <groupId>com.jasonhhouse</groupId>
-        <version>0.9.12</version>
+        <version>0.9.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/RadarrV3/pom.xml b/RadarrV3/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>Gaps</artifactId>
         <groupId>com.jasonhhouse</groupId>
-        <version>0.9.12</version>
+        <version>0.9.13</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/application-custom.yml b/application-custom.yml
@@ -35,7 +35,7 @@ info:
   app:
     name: Gaps
     description: Gaps searches through your Plex Server for all movies, then queries for known movies in the same collection. If those movies don't exist in your library, Gaps will recommend getting those movies, legally of course.
-    version: 0.9.12
+    version: 0.9.13
     storageFolder: /{CUSTOM_FOLDER} #Change to folder that gaps has permission to read, write, and delete in.
     properties:
       rssFeed: rssFeed.json

diff --git a/build b/build
@@ -11,7 +11,7 @@
 ##
 
 set -e
-VERSION=0.9.12
+VERSION=0.9.13
 JAR_VERSION="GapsWeb/target/GapsWeb-$VERSION.jar"
 ZIP_VERSION="GapsAsJar-$VERSION.zip"
 npm ci

diff --git a/cypress/integration/about/about.spec.js b/cypress/integration/about/about.spec.js
@@ -21,7 +21,7 @@ describe('Verify About Page', () => {
       .should('have.text', 'About');
 
     cy.get('.container > :nth-child(3)')
-      .should('have.text', 'v0.9.12');
+      .should('have.text', 'v0.9.13');
 
     cy.get('.container > :nth-child(6)')
       .should('have.text', 'Software');