Merge pull request #2073 from Haehnchen/feature/gradle-build

infrastructure for 2022.3.2

Author: Haehnchen

.github/workflows/gradle.yml

@@ -19,10 +19,10 @@ jobs:
       with:
         submodules: recursive
 
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'adopt'
 
     # Cache Gradle dependencies

build.gradle.kts

@@ -6,9 +6,9 @@ plugins {
     // Java support
     id("java")
     // Kotlin support
-    id("org.jetbrains.kotlin.jvm") version "1.6.20"
+    id("org.jetbrains.kotlin.jvm") version "1.8.10"
     // Gradle IntelliJ Plugin
-    id("org.jetbrains.intellij") version "1.10.0"
+    id("org.jetbrains.intellij") version "1.13.0"
     // Gradle Changelog Plugin
     id("org.jetbrains.changelog") version "1.3.1"
     // Gradle Qodana Plugin

gradle.properties

@@ -10,22 +10,22 @@ pluginVersion = 2022.1.232
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
 # we are able to support a minimum version having at least "TwigElementTypes.ARRAY_LITERAL"
-pluginSinceBuild = 221.5080.224
+pluginSinceBuild = 223.6160.11
 pluginUntilBuild =
 
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
 platformType = IU
-platformVersion = 2022.2.3
+platformVersion = 2022.3.2
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
-platformPlugins = java,yaml,xpath,webDeployment,JavaScriptLanguage,com.jetbrains.php:222.4345.15,de.espend.idea.php.annotation:8.3.0,de.espend.idea.php.toolbox:6.1.0,com.jetbrains.twig:222.4345.21,com.jetbrains.php.dql:222.4345.14
+platformPlugins = java,yaml,xpath,webDeployment,JavaScript,com.jetbrains.php:223.8617.59,de.espend.idea.php.annotation:8.3.0,de.espend.idea.php.toolbox:6.1.0,com.jetbrains.twig:223.8617.59,com.jetbrains.php.dql:223.7571.117
 
 # Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3
-javaVersion = 11
+javaVersion = 17
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
-gradleVersion = 7.4
+gradleVersion = 7.6
 
 # Opt-out flag for bundling Kotlin standard library.
 # See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details.

src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/dict/DoctrineModelFieldLookupElement.java

@@ -47,7 +47,7 @@ public void renderElement(LookupElementPresentation presentation) {
 
         if(this.doctrineModelField.getRelation() != null) {
             presentation.setTypeText(this.doctrineModelField.getRelation());
-            presentation.setIcon(PhpIcons.CLASS_ICON);
+            presentation.setIcon(PhpIcons.CLASS);
         }
 
     }

src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/querybuilder/QueryBuilderCompletionContributor.java

@@ -453,7 +453,7 @@ private void buildLookupElements(CompletionResultSet completionResultSet, QueryB
                 if(field.getRelationType() != null) {
                     lookup = lookup.withTailText("(" + field.getRelationType() + ")", true);
                     lookup = lookup.withTypeText(field.getRelation(), true);
-                    lookup = lookup.withIcon(PhpIcons.CLASS_ICON);
+                    lookup = lookup.withIcon(PhpIcons.CLASS);
                 } else {
                     // relation tail text wins
                     String column = field.getColumn();

src/main/java/fr/adrienbrault/idea/symfony2plugin/external/toolbox/provider/ControllerToolboxProvider.java

@@ -55,7 +55,7 @@ public ProviderPresentation getPresentation() {
             @Nullable
             @Override
             public Icon getIcon() {
-                return PhpIcons.METHOD_ICON;
+                return PhpIcons.METHOD;
             }
 
             @Nullable

src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/Symfony2WebProfilerForm.java

@@ -120,7 +120,7 @@ private void renderRequestDetails(@NotNull ProfilerRequestInterface profilerRequ
             }
 
             if(defaultDataCollector.getController() != null) {
-                listModel.addElement(new RequestDetails(defaultDataCollector.getController(), PhpIcons.METHOD_ICON));
+                listModel.addElement(new RequestDetails(defaultDataCollector.getController(), PhpIcons.METHOD));
             }
 
             if(defaultDataCollector.getTemplate() != null) {

src/main/java/fr/adrienbrault/idea/symfony2plugin/profiler/widget/SymfonyProfilerWidget.java

@@ -6,7 +6,7 @@
 import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.fileEditor.FileEditorManagerEvent;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.ui.popup.ListPopup;
+import com.intellij.openapi.ui.popup.JBPopup;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.wm.IdeFocusManager;
 import com.intellij.openapi.wm.StatusBarWidget;
@@ -140,9 +140,8 @@ private void attachProfileItem(Collection<AnAction> controllerActions, Map<Strin
         }
     }
 
-    @Nullable
     @Override
-    public ListPopup getPopupStep() {
+    public @Nullable JBPopup getPopup() {
         if (isDisposed()) {
             return null;
         }

src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/util/TwigExtensionParser.java

@@ -278,15 +278,15 @@ private static void parseOperators(@NotNull Method method, @NotNull Map<String,
     @NotNull
     public static Icon getIcon(@NotNull TwigExtensionType twigExtensionType) {
         if(twigExtensionType == TwigExtensionType.FUNCTION_NODE) {
-            return PhpIcons.CLASS_INITIALIZER;
+            return PhpIcons.CONSTRUCTOR;
         }
 
         if(twigExtensionType == TwigExtensionType.SIMPLE_FUNCTION) {
             return PhpIcons.FUNCTION;
         }
 
         if(twigExtensionType == TwigExtensionType.FUNCTION_METHOD) {
-            return PhpIcons.METHOD_ICON;
+            return PhpIcons.METHOD;
         }
 
         if(twigExtensionType == TwigExtensionType.FILTER) {
@@ -301,7 +301,7 @@ public static Icon getIcon(@NotNull TwigExtensionType twigExtensionType) {
             return PhpIcons.VARIABLE;
         }
 
-        return PhpIcons.WEB_ICON;
+        return PhpIcons.CLASS_ATTRIBUTE;
     }
 
     @Nullable

src/main/java/fr/adrienbrault/idea/symfony2plugin/util/controller/ControllerActionLookupElement.java

@@ -27,7 +27,7 @@ public void renderElement(LookupElementPresentation presentation) {
         presentation.setItemText(getLookupString());
         presentation.setTypeText(StringUtils.stripStart(controllerAction.getMethod().getFQN(), "\\"));
         presentation.setTypeGrayed(true);
-        presentation.setIcon(PhpIcons.METHOD_ICON);
+        presentation.setIcon(PhpIcons.METHOD);
     }
 
 }