Merge branch 'release/0.7.7'

OpherV · Aug 18, 2021 · 32672cc · 32672cc
2 parents f81695c + e4995a9
commit 32672cc
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ compileJava {
 }
 
 group 'gitflow4idea'
-version '0.7.6'
+version '0.7.7'
 
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
@@ -22,18 +22,24 @@ dependencies {
 }
 
 intellij {
-    version '2021.1'
+    version '2021.2'
     plugins 'git4idea', 'tasks'
 }
 
 patchPluginXml {
     pluginId "Gitflow"
     pluginDescription 'Git Flow Integration'
-    version '0.7.6'
-    sinceBuild '211.0'
-    untilBuild '211.*'
+    version '0.7.7'
+    sinceBuild '212.0'
+    untilBuild '212.*'
     changeNotes """
 
+      <H2>Changelog for 0.7.7</H2>
+      <ul>                                                                                                                                 
+        <li>Fix issue with "Unsupported gitflow version" message presented at startup #328 #329</li>                                                                                                                                                                                                                                             
+        <li>Support for 2021.2 build</li>                                                                                                                                                                                                                                             
+      </ul>
+
       <H2>Changelog for 0.7.6</H2>
       <ul>
         <li>Fix "Error using shortcuts" #322</li>

diff --git a/src/main/java/gitflow/GitflowVersionTester.java b/src/main/java/gitflow/GitflowVersionTester.java
@@ -72,4 +72,8 @@ public void init(){
 			version = returnedVersion;
 		}
 	}
+
+	public boolean hasVersionBeenTested(){
+		return version != null;
+	}
 }
diff --git a/src/main/java/gitflow/ui/GitflowWidget.java b/src/main/java/gitflow/ui/GitflowWidget.java
@@ -141,7 +141,7 @@ public ListPopup getPopupStep() {
     @NotNull
     @Override
     public String getSelectedValue() {
-        if (!getIsSupportedVersion()) {
+        if (getHasVersionBeenTested() && !getIsSupportedVersion()) {
             return "Unsupported Git Flow Version";
         }
         return myText;
@@ -283,7 +283,12 @@ public float getAlignment() {
     }
 
     public boolean getIsSupportedVersion(){
-        return GitflowVersionTester.forProject(myProject).isSupportedVersion();
+        GitflowVersionTester versionTester = GitflowVersionTester.forProject(myProject);
+        return versionTester.hasVersionBeenTested() && versionTester.isSupportedVersion();
+    }
+
+    public boolean getHasVersionBeenTested(){
+        return GitflowVersionTester.forProject(myProject).hasVersionBeenTested();
     }
 
     private void initVersionCheck(){