Skip to content

Commit 60f9cd3

Browse files
committed
prepare PhpStorm 2024.2 build
1 parent 04c6588 commit 60f9cd3

8 files changed

Lines changed: 51 additions & 28 deletions

File tree

.github/workflows/gradle.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
with:
2121
submodules: recursive
2222

23-
- name: Set up JDK 19
24-
uses: actions/setup-java@v2
23+
- name: Set up JDK 21
24+
uses: actions/setup-java@v4
2525
with:
26-
java-version: '19'
26+
java-version: '21'
2727
distribution: 'adopt'
2828

2929
# Cache Gradle dependencies

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ Changelog
22
=========
33

44
# Version names
5-
* 2024.x: PhpStorm 2024.1+
5+
* 2024.2: PhpStorm 2024.2+
6+
* 2024.x: PhpStorm 2024.1+ (no support)
67
* 2023.x: PhpStorm 2023.1+ (no support)
78
* 2022.x: PhpStorm 2022.1+ (no support)
89
* 0.23.x: PhpStorm 2021.1+ (no support)

gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ pluginUntilBuild =
1515

1616
# IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
1717
platformType = IU
18-
platformVersion = 2024.1
18+
platformVersion = 2024.2
1919

2020
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
2121
# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
22-
platformPlugins = java,yaml,xpath,webDeployment,JavaScript,com.jetbrains.php:241.14494.240,de.espend.idea.php.annotation:10.0.0,de.espend.idea.php.toolbox:6.1.0,com.jetbrains.twig:241.14494.240,com.jetbrains.php.dql:241.14494.158
22+
platformPlugins = java,yaml,xpath,webDeployment,JavaScript,com.jetbrains.php:242.20224.361,de.espend.idea.php.annotation:11.0.1,de.espend.idea.php.toolbox:6.1.0,com.jetbrains.twig:242.20224.361,com.jetbrains.php.dql:242.20224.159
2323

2424
# Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3
25-
javaVersion = 17
25+
javaVersion = 21
2626

2727
# Gradle Releases -> https://github.com/gradle/gradle/releases
28-
gradleVersion = 8.4
28+
gradleVersion = 8.8
2929

3030
# Opt-out flag for bundling Kotlin standard library.
3131
# See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details.

gradle/wrapper/gradle-wrapper.jar

3.81 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

gradlew

Lines changed: 28 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 9 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import fr.adrienbrault.idea.symfony2plugin.profiler.dict.ProfilerRequestInterface;
2222
import fr.adrienbrault.idea.symfony2plugin.profiler.factory.ProfilerFactoryUtil;
2323
import fr.adrienbrault.idea.symfony2plugin.profiler.widget.action.SymfonyProfilerWidgetActions;
24+
import kotlin.Suppress;
2425
import org.apache.commons.lang3.StringUtils;
2526
import org.jetbrains.annotations.NotNull;
2627
import org.jetbrains.annotations.Nullable;
@@ -140,6 +141,7 @@ public DefaultActionGroup getActions(){
140141
return actionGroup;
141142
}
142143

144+
@Suppress(names = {"DEPRECATION"})
143145
public @Nullable JBPopup getPopup() {
144146
if (isDisposed()) {
145147
return null;

0 commit comments

Comments
 (0)