From 0d2355eafd269b138058a8547b2b19422a316c0a Mon Sep 17 00:00:00 2001
From: JohnHake <john.hake@jetbrains.com>
Date: Sun, 8 Mar 2020 21:58:02 -0700
Subject: [PATCH 1/2] IJSDK-755

---
 action_basics/build.gradle                           | 5 +++--
 action_basics/src/main/resources/META-INF/plugin.xml | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/action_basics/build.gradle b/action_basics/build.gradle
index 9c4345812..be643e51d 100644
--- a/action_basics/build.gradle
+++ b/action_basics/build.gradle
@@ -16,8 +16,9 @@ repositories {
 
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
-  version '2019.3.3'
-  updateSinceUntilBuild = false
+  // Uncomment the version line below when the product releases
+//  version '2020.1'
+  sameSinceUntilBuild = true
 }
 patchPluginXml {
   version = project.version
diff --git a/action_basics/src/main/resources/META-INF/plugin.xml b/action_basics/src/main/resources/META-INF/plugin.xml
index 72b4edc71..0814beb97 100644
--- a/action_basics/src/main/resources/META-INF/plugin.xml
+++ b/action_basics/src/main/resources/META-INF/plugin.xml
@@ -39,9 +39,10 @@
   <actions>
     <!-- See https://www.jetbrains.org/intellij/sdk/docs/basics/action_system.html#registering-actions-in-pluginxml
           for information about the elements and attributes used for actions and groups. -->
-    <!-- This <action> element adds a static menu item in first position of the Tools menu that shows PopupDialogAction. -->
+    <!-- The <action> element adds a static menu item in first position of the Tools menu that shows PopupDialogAction.  -->
     <action id="org.intellij.sdk.action.PopupDialogAction" class="org.intellij.sdk.action.PopupDialogAction"
-            text="Pop Dialog Action" description="SDK action example" icon="ActionBasicsIcons.Sdk_default_icon">
+            text="Action Basics Plugin: Pop Dialog Action" description="SDK action example" icon="ActionBasicsIcons.Sdk_default_icon">
+      <override-text place="MainMenu" text="Pop Dialog Action"/>
       <keyboard-shortcut first-keystroke="control alt A" second-keystroke="C" keymap="$default"/>
       <mouse-shortcut keystroke="control button3 doubleClick" keymap="$default"/>
       <add-to-group group-id="ToolsMenu" anchor="first"/>

From 085f35ed2e516e1e7985cc9436b354fe85d40742 Mon Sep 17 00:00:00 2001
From: JohnHake <john.hake@jetbrains.com>
Date: Wed, 18 Mar 2020 15:58:39 -0700
Subject: [PATCH 2/2] Add override-text

---
 action_basics/build.gradle                           |  3 +--
 action_basics/src/main/resources/META-INF/plugin.xml | 10 +---------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/action_basics/build.gradle b/action_basics/build.gradle
index be643e51d..293b3d033 100644
--- a/action_basics/build.gradle
+++ b/action_basics/build.gradle
@@ -16,8 +16,7 @@ repositories {
 
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
-  // Uncomment the version line below when the product releases
-//  version '2020.1'
+  version '201-EAP-SNAPSHOT'
   sameSinceUntilBuild = true
 }
 patchPluginXml {
diff --git a/action_basics/src/main/resources/META-INF/plugin.xml b/action_basics/src/main/resources/META-INF/plugin.xml
index 0814beb97..7e343d70d 100644
--- a/action_basics/src/main/resources/META-INF/plugin.xml
+++ b/action_basics/src/main/resources/META-INF/plugin.xml
@@ -7,13 +7,6 @@
   <!-- Text to display as name on Preferences/Settings | Plugin page -->
   <name>SDK: Action Sample Project</name>
 
-  <!-- The version of this plugin -->
-  <version>2.0.0</version>
-
-  <!-- Compatible with the following versions of IntelliJ Platform:
-        version 2018.3 (build #183) and newer. -->
-  <idea-version since-build="191"/>
-
   <!-- Indicate this plugin can be loaded in all IntelliJ Platform-based products. -->
   <depends>com.intellij.modules.platform</depends>
 
@@ -45,7 +38,6 @@
       <override-text place="MainMenu" text="Pop Dialog Action"/>
       <keyboard-shortcut first-keystroke="control alt A" second-keystroke="C" keymap="$default"/>
       <mouse-shortcut keystroke="control button3 doubleClick" keymap="$default"/>
-      <add-to-group group-id="ToolsMenu" anchor="first"/>
     </action>
     <!-- All of the following menu groups add the action PopupDialogAction to menus in different ways.
           Note that even though these groups reuse the same action class, in each use the action ids are unique. -->
@@ -75,4 +67,4 @@
     </group>
   </actions>
 
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>