Merge branch 'release/0.7.5'

OpherV · Dec 18, 2020 · 5b29fd8 · 5b29fd8
2 parents 7c108e0 + df37182
commit 5b29fd8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,14 @@
 plugins {
     id 'java'
-    id 'org.jetbrains.intellij' version '0.4.18'
+    id 'org.jetbrains.intellij' version '0.6.4'
 }
 
 compileJava {
     options.compilerArgs += ["-Xlint"]
 }
 
 group 'gitflow4idea'
-version '0.7.4'
+version '0.7.5'
 
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
@@ -22,18 +22,24 @@ dependencies {
 }
 
 intellij {
-    version '2020.2'
+    version '2020.3'
     plugins 'git4idea', 'tasks'
 }
 
 patchPluginXml {
     pluginId "Gitflow"
     pluginDescription 'Git Flow Integration'
-    version '0.7.4'
-    sinceBuild '201.0'
-    untilBuild '202.*'
+    version '0.7.5'
+    sinceBuild '203.0'
+    untilBuild '203.*'
     changeNotes """
 
+      <H2>Changelog for 0.7.5</H2>
+      <ul>
+        <li>PluginException: Icon cannot be found in 'AllIcons.Vcs.CheckOut' #314 (@tumb1er)</li>                                                                                                                   
+        <li>Support for 2020.3 build</li>                                                                                                                                                                                                                                             
+      </ul>
+
       <H2>Changelog for 0.7.4</H2>
       <ul>
         <li>Fix deprecations #298 (@fabmars)</li>                                                                                                                   

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -39,7 +39,7 @@
         />
         <action id="Gitflow.TrackFeature" class="gitflow.actions.TrackFeatureAction"
                 text="Track Feature..."
-                icon="AllIcons.Vcs.CheckOut"
+                icon="AllIcons.Actions.CheckOut"
         />
 
         <action id="Gitflow.StartRelease" class="gitflow.actions.StartReleaseAction"