Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed new intellij version compatibility issues #1182

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 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.3'
id 'checkstyle'
id 'pmd'
id 'org.jetbrains.changelog' version '1.2.1'
Expand All @@ -23,8 +23,8 @@ 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.54")
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
2 changes: 1 addition & 1 deletion resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.3345.118"/>

<!-- 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 @@ -2,32 +2,35 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

package com.magento.idea.magento2plugin.generation.php;

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 javax.swing.Icon;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.Icon;

public class MagentoTemplatesFactory extends ProjectTemplatesFactory {
public MagentoTemplatesFactory() {
}

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

public Icon getGroupIcon(String group) {
@Override
public Icon getGroupIcon(final String group) {
return PhpIcons.Php_icon;
}

@NotNull
public ProjectTemplate[] createTemplates(@Nullable String group, WizardContext context) {
@Override
public @NotNull ProjectTemplate[] createTemplates(
final @Nullable String group,
final @NotNull WizardContext context
) {
return new ProjectTemplate[]{new MagentoModuleGenerator()};
}
}