Skip to content

Commit

Permalink
5.0.0-develop initial
Browse files Browse the repository at this point in the history
  • Loading branch information
VitaliyBoyko committed Sep 12, 2022
1 parent 84ee9aa commit 0be7719
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 11 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0).

## 5.0.0

## 4.4.0

## 4.3.0
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

1. Check out this repository
1. Open a folder with the project in the IntelliJ Ultimate using the `open` action button.
1. Make sure that you on the latest develop branch (e.g `4.4.0-develop`)
1. Make sure that you on the latest develop branch (e.g `5.0.0-develop`)
1. Right-click on the `build.gradle` file, choose "Import Gradle project" (if this is not exist look for "Build module '<root folder name>'") (you need to have Gradle plugin installed)
1. Check if the right SDK version is used for the project.
- Current Java version for the project is **java 11**, so you should additionally download **SDK 11** and choose it in the module settings: `Right click by the project root > Open Module Settings > Project Settings > Project > Project SDK`
Expand Down
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

plugins {
id 'org.jetbrains.intellij' version '1.1.4'
id 'org.jetbrains.intellij' version '1.5.2'
id 'checkstyle'
id 'pmd'
id 'org.jetbrains.changelog' version '1.2.1'
Expand All @@ -15,16 +15,16 @@ repositories {
}

group 'com.magento.idea'
version '4.4.0'
version '5.0.0'

apply plugin: 'org.jetbrains.intellij'
apply plugin: 'java'
apply plugin: 'idea'
apply plugin: 'groovy'
apply plugin: 'org.jetbrains.changelog'

def phpPluginVersion = System.getProperty("phpPluginVersion", "212.5080.55")
def ideaVersion = System.getProperty("ideaVersion", "2021.2.1")
def phpPluginVersion = System.getProperty("phpPluginVersion", "222.3739.45")
def ideaVersion = System.getProperty("ideaVersion", "2022.2.1")
def javaVersion = 11

sourceCompatibility = javaVersion
Expand All @@ -41,7 +41,7 @@ intellij {
'properties',
'CSS',
'JavaScriptLanguage',
'com.intellij.lang.jsgraphql:3.1.2',
'com.intellij.lang.jsgraphql:3.2.1',
'platform-images',
'copyright'
]
Expand Down
4 changes: 2 additions & 2 deletions resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<idea-plugin require-restart="true">
<id>com.magento.idea.magento2plugin</id>
<name>Magento PhpStorm</name>
<version>4.4.0</version>
<version>5.0.0</version>
<vendor url="https://github.com/magento/magento2-phpstorm-plugin">Magento Inc.</vendor>

<description><![CDATA[
Expand All @@ -24,7 +24,7 @@
</change-notes>

<!-- please see http://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
<idea-version since-build="212.5080.55"/>
<idea-version since-build="222.3739.54"/>

<!-- please see http://confluence.jetbrains.com/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
on how to target different products -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.intellij.ide.util.projectWizard.WizardContext;
import com.intellij.platform.ProjectTemplate;
import com.intellij.platform.ProjectTemplatesFactory;
import com.jetbrains.php.config.generation.PhpEmptyTemplatesFactory;
import com.jetbrains.php.config.generation.PhpEmptyProjectGenerator;
import icons.PhpIcons;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand All @@ -19,11 +19,11 @@ public MagentoTemplatesFactory() {

@NotNull
public String[] getGroups() {
return new String[]{PhpEmptyTemplatesFactory.PHP_PROJECT_TEMPLATE_GROUP};
return new String[]{PhpEmptyProjectGenerator.PHP_PROJECT_TEMPLATE_GROUP};
}

public Icon getGroupIcon(String group) {
return PhpIcons.Php_icon;
return PhpIcons.PhpIcon;
}

@NotNull
Expand Down

0 comments on commit 0be7719

Please sign in to comment.