Merge branch 'master' into IJSDK-473

Resolve conflics in 3 files
This commit is contained in:
JohnHake 2019-06-17 20:30:21 -07:00
commit 43c5818468
3 changed files with 1 additions and 3 deletions

View File

@ -46,7 +46,6 @@ Note that the naming convention relates to the `Artifact ID`, which is the Gradl
This is different than the `<name>` definition provided in the [`plugin.xml`](#pluginxml-conventions) file.
See the [Plugin Gradle Properties](/tutorials/build_system/prerequisites.md#plugin-gradle-properties-and-plugin-configuration-file-elements) section for more information about the distinction.
## Plugin Copyright Statements
Use the standard intellij-community copyright notice in all sample plugins authored by JetBrains:
```text

View File

@ -19,4 +19,4 @@ The following tutorial refers to materials that can be found in the included [gr
Below are a series of guides to developing and deploying Gradle-based IntelliJ Platform Plugins:
* [1. Getting Started with Gradle-Based Plugins](build_system/prerequisites.md)
* [2. Configuring Gradle-Based Plugins](build_system/gradle_guide.md)
* [3. Deploying a Plugin with Gradle](build_system/deployment.md)
* [3. Deploying a Plugin with Gradle](build_system/deployment.md)

View File

@ -157,7 +157,6 @@ Converting a DevKit-based plugin project to a Gradle-based plugin project can be
* Click _Finish_ to create the new Gradle-based plugin.
* [Add more modules](https://www.jetbrains.com/help/idea/gradle.html#gradle_add_module) using Gradle [_Source Sets_](https://www.jetbrains.com/help/idea/gradle.html#gradle_source_sets) as needed.
## Running a Simple Gradle-Based IntelliJ Platform Plugin
Before running [`my_gradle_project`](#components-of-a-wizard-generated-gradle-intellij-platform-plugin), some code needs to be added to provide simple functionality.
* Using the code below, add a `HelloAction.java` class to the `src/main/java/` folder.