Merge branch 'IJSDK-755'

# Conflicts:
#	reference_guide/api_notable/api_notable_list_2020.md
This commit is contained in:
JohnHake 2020-03-18 16:07:27 -07:00
commit 328e74a1fa
2 changed files with 5 additions and 12 deletions

View File

@ -16,8 +16,8 @@ repositories {
// See https://github.com/JetBrains/gradle-intellij-plugin/ // See https://github.com/JetBrains/gradle-intellij-plugin/
intellij { intellij {
version '2019.3.3' version '201-EAP-SNAPSHOT'
updateSinceUntilBuild = false sameSinceUntilBuild = true
} }
patchPluginXml { patchPluginXml {
version = project.version version = project.version

View File

@ -8,13 +8,6 @@
<!-- Text to display as name on Preferences/Settings | Plugin page --> <!-- Text to display as name on Preferences/Settings | Plugin page -->
<name>SDK: Action Sample Project</name> <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. --> <!-- Indicate this plugin can be loaded in all IntelliJ Platform-based products. -->
<depends>com.intellij.modules.platform</depends> <depends>com.intellij.modules.platform</depends>
@ -40,12 +33,12 @@
<actions> <actions>
<!-- See https://www.jetbrains.org/intellij/sdk/docs/basics/action_system.html#registering-actions-in-pluginxml <!-- 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. --> 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" <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"/> <keyboard-shortcut first-keystroke="control alt A" second-keystroke="C" keymap="$default"/>
<mouse-shortcut keystroke="control button3 doubleClick" keymap="$default"/> <mouse-shortcut keystroke="control button3 doubleClick" keymap="$default"/>
<add-to-group group-id="ToolsMenu" anchor="first"/>
</action> </action>
<!-- All of the following menu groups add the action PopupDialogAction to menus in different ways. <!-- 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. --> Note that even though these groups reuse the same action class, in each use the action ids are unique. -->