Merge branch 'release/0.7.4'

OpherV · Jul 31, 2020 · 7c108e0 · 7c108e0
2 parents 20df0ab + bb15e3a
commit 7c108e0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ compileJava {
 }
 
 group 'gitflow4idea'
-version '0.7.3'
+version '0.7.4'
 
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
@@ -22,18 +22,24 @@ dependencies {
 }
 
 intellij {
-    version '2020.1'
+    version '2020.2'
     plugins 'git4idea', 'tasks'
 }
 
 patchPluginXml {
     pluginId "Gitflow"
     pluginDescription 'Git Flow Integration'
-    version '0.7.3'
+    version '0.7.4'
     sinceBuild '201.0'
-    untilBuild '201.*'
+    untilBuild '202.*'
     changeNotes """
 
+      <H2>Changelog for 0.7.4</H2>
+      <ul>
+        <li>Fix deprecations #298 (@fabmars)</li>                                                                                                                   
+        <li>Support for 2020.2 build</li>                                                                                                                                                                                                                                             
+      </ul>
+
       <H2>Changelog for 0.7.3</H2>
       <ul>
         <li>Implemented sorting and filtering of track branch dialog #290 (@mmopitz)</li>                                                                                                                   

diff --git a/src/main/java/gitflow/ui/GitflowTaskDialogPanelProvider.java b/src/main/java/gitflow/ui/GitflowTaskDialogPanelProvider.java
@@ -1,10 +1,10 @@
 package gitflow.ui;
+
 import com.intellij.openapi.project.Project;
 import com.intellij.tasks.LocalTask;
-import com.intellij.tasks.Task;
 import com.intellij.tasks.TaskManager;
+import com.intellij.tasks.actions.vcs.VcsTaskDialogPanelProvider;
 import com.intellij.tasks.ui.TaskDialogPanel;
-import com.intellij.tasks.ui.TaskDialogPanelProvider;
 import git4idea.branch.GitBranchUtil;
 import git4idea.repo.GitRepository;
 import gitflow.GitflowBranchUtil;
@@ -13,14 +13,7 @@
 import org.jetbrains.annotations.Nullable;
 
 
-public class GitflowTaskDialogPanelProvider extends TaskDialogPanelProvider {
-
-    @Deprecated
-    @Nullable
-    @Override
-    public TaskDialogPanel getOpenTaskPanel(@NotNull Project project, @NotNull Task task) {
-        return null;
-    }
+public class GitflowTaskDialogPanelProvider extends VcsTaskDialogPanelProvider {
 
     @Nullable
     @Override