From aea4520277e9c9665caf9af9b55fc0f151e99231 Mon Sep 17 00:00:00 2001
From: William278 <will27528@gmail.com>
Date: Fri, 24 Feb 2023 11:26:29 +0000
Subject: [PATCH] Fix same version reporting as out-of-date

---
 .github/workflows/gradle-ci.yml               |  4 +-
 .idea/gradle.xml                              |  4 +-
 .idea/workspace.xml                           | 79 +++++++------------
 build.gradle                                  |  3 +-
 .../william278/desertwell/UpdateChecker.java  |  2 +-
 5 files changed, 36 insertions(+), 56 deletions(-)

diff --git a/.github/workflows/gradle-ci.yml b/.github/workflows/gradle-ci.yml
index 3c2ddae..b8ab462 100644
--- a/.github/workflows/gradle-ci.yml
+++ b/.github/workflows/gradle-ci.yml
@@ -18,9 +18,7 @@ permissions:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v3
     - name: Set up JDK 11
@@ -31,4 +29,4 @@ jobs:
     - name: Build with Gradle
       uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
       with:
-        arguments: test
+        arguments: test
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 59c272e..10e7646 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,9 +4,11 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="delegatedBuild" value="true" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Gradle/gradle-7.2" />
+        <option name="gradleJvm" value="corretto-11" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d4d188d..7cb68e7 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,11 +4,12 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="9a02c230-5b64-4687-85e4-aeee92a12593" name="Changes" comment="Update README.md">
+    <list default="true" id="9a02c230-5b64-4687-85e4-aeee92a12593" name="Changes" comment="Fix same version reporting as out-of-date">
+      <change beforePath="$PROJECT_DIR$/.github/workflows/gradle-ci.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.github/workflows/gradle-ci.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/william278/desertwell/AboutMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/william278/desertwell/AboutMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/net/william278/desertwell/UpdateChecker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/william278/desertwell/UpdateChecker.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -49,16 +50,22 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
-    &quot;last_opened_file_path&quot;: &quot;C:/Users/William/IdeaProjects/DesertWell/src/main/java/net/william278/desertwell&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+    "WebServerToolWindowFactoryState": "false",
+    "last_opened_file_path": "C:/Users/William/IdeaProjects/DesertWell/src/main/java/net/william278/desertwell",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "settings.editor.selected.configurable": "reference.settingsdialog.project.gradle",
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="C:\Users\William\IdeaProjects\DesertWell\src\main\java\net\william278\desertwell" />
@@ -67,8 +74,8 @@
       <recent name="net.william278.desertwell" />
     </key>
   </component>
-  <component name="RunManager" selected="Gradle.UpdateCheckerTests">
-    <configuration name="UpdateCheckerTests" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+  <component name="RunManager" selected="Gradle.DesertWell [build]">
+    <configuration name="DesertWell [build]" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
       <ExternalSystemSettings>
         <option name="executionName" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -79,42 +86,17 @@
         </option>
         <option name="taskNames">
           <list>
-            <option value=":test" />
-            <option value="--tests" />
-            <option value="&quot;net.william278.desertwell.UpdateCheckerTests&quot;" />
-          </list>
-        </option>
-        <option name="vmOptions" />
-      </ExternalSystemSettings>
-      <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
-      <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-      <DebugAllEnabled>false</DebugAllEnabled>
-      <method v="2" />
-    </configuration>
-    <configuration name="UpdateCheckerTests.testUpdateChecker" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
-      <ExternalSystemSettings>
-        <option name="executionName" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="externalSystemIdString" value="GRADLE" />
-        <option name="scriptParameters" value="" />
-        <option name="taskDescriptions">
-          <list />
-        </option>
-        <option name="taskNames">
-          <list>
-            <option value=":test" />
-            <option value="--tests" />
-            <option value="&quot;net.william278.desertwell.UpdateCheckerTests.testUpdateChecker&quot;" />
+            <option value="build" />
           </list>
         </option>
         <option name="vmOptions" />
       </ExternalSystemSettings>
-      <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
+      <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
       <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
       <DebugAllEnabled>false</DebugAllEnabled>
       <method v="2" />
     </configuration>
-    <configuration name="VersionTests" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
+    <configuration name="Run Tests" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
       <ExternalSystemSettings>
         <option name="executionName" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -126,8 +108,6 @@
         <option name="taskNames">
           <list>
             <option value=":test" />
-            <option value="--tests" />
-            <option value="&quot;net.william278.desertwell.VersionTests&quot;" />
           </list>
         </option>
         <option name="vmOptions" />
@@ -138,15 +118,12 @@
       <method v="2" />
     </configuration>
     <list>
-      <item itemvalue="Gradle.UpdateCheckerTests" />
-      <item itemvalue="Gradle.UpdateCheckerTests.testUpdateChecker" />
-      <item itemvalue="Gradle.VersionTests" />
+      <item itemvalue="Gradle.DesertWell [build]" />
+      <item itemvalue="Gradle.Run Tests" />
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Gradle.UpdateCheckerTests.testUpdateChecker" />
-        <item itemvalue="Gradle.UpdateCheckerTests" />
-        <item itemvalue="Gradle.VersionTests" />
+        <item itemvalue="Gradle.Run Tests" />
       </list>
     </recent_temporary>
   </component>
@@ -160,6 +137,7 @@
       <updated>1661334712505</updated>
       <workItem from="1661334713968" duration="5169000" />
       <workItem from="1663673884544" duration="72000" />
+      <workItem from="1677237222251" duration="636000" />
     </task>
     <task id="LOCAL-00001" summary="Initial commit">
       <created>1661342956453</created>
@@ -195,6 +173,7 @@
   <component name="VcsManagerConfiguration">
     <MESSAGE value="Initial commit" />
     <MESSAGE value="Update README.md" />
-    <option name="LAST_COMMIT_MESSAGE" value="Update README.md" />
+    <MESSAGE value="Fix same version reporting as out-of-date" />
+    <option name="LAST_COMMIT_MESSAGE" value="Fix same version reporting as out-of-date" />
   </component>
 </project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index f165196..ae0e23d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,11 @@
 plugins {
     id 'java'
     id 'maven-publish'
+    id 'com.github.johnrengelman.shadow' version '6.1.0'
 }
 
 group 'net.william278'
-version '1.1'
+version '1.1.1'
 
 repositories {
     mavenCentral()
diff --git a/src/main/java/net/william278/desertwell/UpdateChecker.java b/src/main/java/net/william278/desertwell/UpdateChecker.java
index deb429d..8d49c7a 100644
--- a/src/main/java/net/william278/desertwell/UpdateChecker.java
+++ b/src/main/java/net/william278/desertwell/UpdateChecker.java
@@ -74,7 +74,7 @@ public class UpdateChecker {
      * @return A {@link CompletableFuture} containing true if the current plugin {@link Version} is outdated
      */
     public CompletableFuture<Boolean> isUpToDate() {
-        return getLatestVersion().thenApply(latestVersion -> currentVersion.compareTo(latestVersion) > 0);
+        return getLatestVersion().thenApply(latestVersion -> currentVersion.compareTo(latestVersion) >= 0);
     }
 
 }
\ No newline at end of file