diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index c69d904b4..bf210056a 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -13,10 +13,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v3
with:
- java-version: 11
+ java-version: 17
distribution: 'temurin'
cache: gradle
- uses: actions/cache@v3
@@ -39,10 +39,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v3
with:
- java-version: 11
+ java-version: 17
distribution: 'temurin'
cache: gradle
- uses: actions/cache@v3
@@ -65,10 +65,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v3
with:
- java-version: 11
+ java-version: 17
distribution: 'temurin'
cache: gradle
- uses: actions/cache@v3
@@ -91,10 +91,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v3
with:
- java-version: 11
+ java-version: 17
distribution: 'temurin'
cache: gradle
- uses: actions/cache@v3
diff --git a/.github/workflows/gradlepublish.yml b/.github/workflows/gradlepublish.yml
index dd3d8b681..9e43f3172 100644
--- a/.github/workflows/gradlepublish.yml
+++ b/.github/workflows/gradlepublish.yml
@@ -13,10 +13,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v3
with:
- java-version: 11
+ java-version: 17
distribution: 'temurin'
cache: gradle
- name: Gradle wrapper
diff --git a/.github/workflows/gradlepublishalpha.yml b/.github/workflows/gradlepublishalpha.yml
index 94a7e37fa..3da070f9e 100644
--- a/.github/workflows/gradlepublishalpha.yml
+++ b/.github/workflows/gradlepublishalpha.yml
@@ -14,10 +14,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v3
with:
- java-version: 11
+ java-version: 17
distribution: 'temurin'
cache: gradle
- name: Gradle wrapper
diff --git a/README.md b/README.md
index 54a7e43a1..2bdb04ce6 100644
--- a/README.md
+++ b/README.md
@@ -21,8 +21,8 @@
## Works with
-* PhpStorm >= 2021.2.1
-* JRE >= 11
+* PhpStorm >= 2023.1
+* JRE >= 17
## Features
diff --git a/build.gradle b/build.gradle
index 9169cf2d1..c5cd80251 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@
*/
plugins {
- id 'org.jetbrains.intellij' version '1.13.2'
+ id 'org.jetbrains.intellij' version '1.13.3'
id 'checkstyle'
id 'pmd'
id 'org.jetbrains.changelog' version '2.0.0'
@@ -23,9 +23,9 @@ apply plugin: 'idea'
apply plugin: 'groovy'
apply plugin: 'org.jetbrains.changelog'
-def phpPluginVersion = System.getProperty("phpPluginVersion", "222.3739.45")
-def ideaVersion = System.getProperty("ideaVersion", "2022.2.1")
-def javaVersion = 11
+def phpPluginVersion = System.getProperty("phpPluginVersion", "231.8109.199")
+def ideaVersion = System.getProperty("ideaVersion", "2023.1")
+def javaVersion = 17
sourceCompatibility = javaVersion
targetCompatibility = javaVersion
@@ -39,9 +39,9 @@ intellij {
'yaml',
'java-i18n',
'properties',
- 'CSS',
- 'JavaScriptLanguage',
- 'com.intellij.lang.jsgraphql:3.2.1',
+ 'com.intellij.css',
+ 'JavaScript',
+ 'com.intellij.lang.jsgraphql:3.4.0',
'platform-images',
'copyright'
]
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
index bd6507d20..064234179 100644
--- a/resources/META-INF/plugin.xml
+++ b/resources/META-INF/plugin.xml
@@ -24,7 +24,7 @@
-
+
@@ -33,6 +33,7 @@
-->
com.jetbrains.php
JavaScript
+ com.intellij.css
com.intellij.modules.platform
com.intellij.platform.images
com.intellij.copyright
diff --git a/src/com/magento/idea/magento2plugin/actions/groups/NewEavAttributeGroup.java b/src/com/magento/idea/magento2plugin/actions/groups/NewEavAttributeGroup.java
index c057e6c22..c356d1cd3 100644
--- a/src/com/magento/idea/magento2plugin/actions/groups/NewEavAttributeGroup.java
+++ b/src/com/magento/idea/magento2plugin/actions/groups/NewEavAttributeGroup.java
@@ -8,8 +8,6 @@
import com.intellij.ide.actions.NonTrivialActionGroup;
import com.intellij.openapi.util.IconLoader;
import com.magento.idea.magento2plugin.MagentoIcons;
-import javax.swing.Icon;
-import org.jetbrains.annotations.NotNull;
public class NewEavAttributeGroup extends NonTrivialActionGroup {
@@ -19,12 +17,8 @@ public class NewEavAttributeGroup extends NonTrivialActionGroup {
public NewEavAttributeGroup() {
super();
- this.getTemplatePresentation().setIcon(new IconLoader.LazyIcon() {
- @NotNull
- @Override
- protected Icon compute() {
- return MagentoIcons.MODULE;
- }
- });
+ this.getTemplatePresentation().setIcon(
+ IconLoader.createLazy(() -> MagentoIcons.MODULE)
+ );
}
}
diff --git a/src/com/magento/idea/magento2plugin/actions/groups/NewModuleFileGroup.java b/src/com/magento/idea/magento2plugin/actions/groups/NewModuleFileGroup.java
index e96f568d0..ac7ab20b8 100644
--- a/src/com/magento/idea/magento2plugin/actions/groups/NewModuleFileGroup.java
+++ b/src/com/magento/idea/magento2plugin/actions/groups/NewModuleFileGroup.java
@@ -9,7 +9,7 @@
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader.LazyIcon;
+import com.intellij.openapi.util.IconLoader;
import com.intellij.psi.PsiDirectory;
import com.intellij.psi.PsiElement;
import com.magento.idea.magento2plugin.MagentoIcons;
@@ -18,8 +18,6 @@
import com.magento.idea.magento2plugin.project.Settings;
import com.magento.idea.magento2plugin.util.magento.GetMagentoModuleUtil;
import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectoryUtil;
-import javax.swing.Icon;
-import org.jetbrains.annotations.NotNull;
public class NewModuleFileGroup extends NonTrivialActionGroup {
@@ -29,13 +27,9 @@ public class NewModuleFileGroup extends NonTrivialActionGroup {
public NewModuleFileGroup() {
super();
- this.getTemplatePresentation().setIcon(new LazyIcon() {
- @NotNull
- @Override
- protected Icon compute() {
- return MagentoIcons.MODULE;
- }
- });
+ this.getTemplatePresentation().setIcon(
+ IconLoader.createLazy(() -> MagentoIcons.MODULE)
+ );
}
@Override
diff --git a/src/com/magento/idea/magento2plugin/init/ConfigurationManager.java b/src/com/magento/idea/magento2plugin/init/ConfigurationManager.java
index 7f5548015..f28d834a9 100644
--- a/src/com/magento/idea/magento2plugin/init/ConfigurationManager.java
+++ b/src/com/magento/idea/magento2plugin/init/ConfigurationManager.java
@@ -184,7 +184,7 @@ public void actionPerformed(@NotNull AnActionEvent e) {
}
private static boolean isInIncludePath(@NotNull VirtualFile fileToCheck, @NotNull Project project) {
- List includePaths = PhpIncludePathManager.getInstance(project).getRoots();
+ List includePaths = PhpIncludePathManager.getInstance(project).getAllIncludedRoots();
Iterator iterator = includePaths.iterator();
VirtualFile file;