Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 1928b76

Browse files
java update
1 parent 9b5c1b1 commit 1928b76

File tree

8 files changed

+90
-62
lines changed

8 files changed

+90
-62
lines changed

‎.github/workflows/gradle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ jobs:
4444
run: chmod +x gradlew
4545

4646
- name: Build with Gradle
47-
run: export PHPSTORM_ENV=skip && ./gradlew check verifyPlugin buildPlugin
47+
run: export PHPSTORM_ENV=skip && ./gradlew check test buildPlugin

‎build.gradle.kts

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
1+
import org.jetbrains.intellij.platform.gradle.TestFrameworkType
12
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
23

34
fun properties(key: String) = project.findProperty(key).toString()
45

56
plugins {
6-
// Java support
77
id("java")
8-
// Kotlin support
9-
id("org.jetbrains.kotlin.jvm") version "1.9.22"
10-
// Gradle IntelliJ Plugin
11-
id("org.jetbrains.intellij") version "1.17.2"
12-
// Gradle Changelog Plugin
8+
id("org.jetbrains.kotlin.jvm") version "2.0.0"
9+
id("org.jetbrains.intellij.platform") version "2.4.0"
1310
id("org.jetbrains.changelog") version "1.3.1"
14-
// Gradle Qodana Plugin
1511
id("org.jetbrains.qodana") version "0.1.13"
1612
}
1713

@@ -21,21 +17,37 @@ version = properties("pluginVersion")
2117
// Configure project's dependencies
2218
repositories {
2319
mavenCentral()
20+
21+
intellijPlatform {
22+
defaultRepositories()
23+
}
2424
}
2525

2626
dependencies {
27-
implementation("org.junit.jupiter:junit-jupiter:5.8.2")
27+
intellijPlatform {
28+
val version = providers.gradleProperty("platformVersion")
29+
val type = providers.gradleProperty("platformType")
30+
create(type, version, useInstaller = false)
31+
32+
bundledPlugins(properties("platformBundledPlugins").split(',').map(String::trim).filter(String::isNotEmpty))
33+
plugins(properties("platformPlugins").split(',').map(String::trim).filter(String::isNotEmpty))
34+
35+
testFramework(TestFrameworkType.Platform)
36+
testFramework(TestFrameworkType.Plugin.Java)
37+
}
38+
39+
testImplementation("junit:junit:4.13.2")
40+
testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
2841
testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.8.2")
2942
}
3043

3144
// Configure Gradle IntelliJ Plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
32-
intellij {
33-
pluginName.set(properties("pluginName"))
34-
version.set(properties("platformVersion"))
35-
type.set(properties("platformType"))
36-
37-
// Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file.
38-
plugins.set(properties("platformPlugins").split(',').map(String::trim).filter(String::isNotEmpty))
45+
intellijPlatform {
46+
pluginConfiguration {
47+
name = properties("pluginName")
48+
}
49+
instrumentCode = false
50+
buildSearchableOptions = false
3951
}
4052

4153
// Configure Gradle Changelog Plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
@@ -69,7 +81,7 @@ tasks {
6981
}
7082

7183
patchPluginXml {
72-
version.set(properties("pluginVersion"))
84+
version=properties("pluginVersion")
7385
sinceBuild.set(properties("pluginSinceBuild"))
7486
untilBuild.set(properties("pluginUntilBuild"))
7587
changeNotes.set(file("src/main/resources/META-INF/change-notes.html").readText().replace("<html>", "").replace("</html>", ""))
@@ -82,15 +94,6 @@ tasks {
8294
// })
8395
}
8496

85-
// Configure UI tests plugin
86-
// Read more: https://github.com/JetBrains/intellij-ui-test-robot
87-
runIdeForUiTests {
88-
systemProperty("robot-server.port", "8082")
89-
systemProperty("ide.mac.message.dialogs.as.sheets", "false")
90-
systemProperty("jb.privacy.policy.text", "<!--999.999-->")
91-
systemProperty("jb.consents.confirmation.enabled", "false")
92-
}
93-
9497
signPlugin {
9598
certificateChain.set(System.getenv("CERTIFICATE_CHAIN"))
9699
privateKey.set(System.getenv("PRIVATE_KEY"))

‎gradle.properties

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,23 @@ pluginVersion = 2022年1月26日4
1010
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
1111
# for insight into build numbers and IntelliJ Platform versions.
1212
# we are able to support a minimum version having at least "TwigElementTypes.ARRAY_LITERAL"
13-
pluginSinceBuild = 241.14494
13+
pluginSinceBuild = 243
1414
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.3.5
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 = com.jetbrains.php:243.26053.27,de.espend.idea.php.annotation:11.1.1,de.espend.idea.php.toolbox:6.1.0,com.jetbrains.twig:243.26053.20,com.jetbrains.php.dql:243.21565.129
23+
platformBundledPlugins = com.intellij.java,com.jetbrains.plugins.webDeployment,org.jetbrains.plugins.yaml,JavaScript
2324

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

2728
# Gradle Releases -> https://github.com/gradle/gradle/releases
28-
gradleVersion = 8.4
29+
gradleVersion = 8.13
2930

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

‎gradle/wrapper/gradle-wrapper.jar

-15.7 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.13-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

‎gradlew

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +82,11 @@ do
8082
esac
8183
done
8284

83-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
84-
85-
APP_NAME="Gradle"
85+
# This is normally unused
86+
# shellcheck disable=SC2034
8687
APP_BASE_NAME=${0##*/}
87-
88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
88+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9090

9191
# Use the maximum available, or set MAX_FD != -1 to use that value.
9292
MAX_FD=maximum
@@ -133,22 +133,29 @@ location of your Java installation."
133133
fi
134134
else
135135
JAVACMD=java
136-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
136+
if ! command -v java >/dev/null 2>&1
137+
then
138+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137139
138140
Please set the JAVA_HOME variable in your environment to match the
139141
location of your Java installation."
142+
fi
140143
fi
141144

142145
# Increase the maximum file descriptors if we can.
143146
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144147
case $MAX_FD in #(
145148
max*)
149+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
150+
# shellcheck disable=SC2039,SC3045
146151
MAX_FD=$( ulimit -H -n ) ||
147152
warn "Could not query maximum file descriptor limit"
148153
esac
149154
case $MAX_FD in #(
150155
'' | soft) :;; #(
151156
*)
157+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
158+
# shellcheck disable=SC2039,SC3045
152159
ulimit -n "$MAX_FD" ||
153160
warn "Could not set maximum file descriptor limit to $MAX_FD"
154161
esac
@@ -193,18 +200,28 @@ if "$cygwin" || "$msys" ; then
193200
done
194201
fi
195202

196-
# Collect all arguments for the java command;
197-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
198-
# shell script including quotes and variable substitutions, so put them in
199-
# double quotes to make sure that they get re-expanded; and
200-
# * put everything else in single quotes, so that it's not re-expanded.
203+
204+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
205+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
206+
207+
# Collect all arguments for the java command:
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
209+
# and any embedded shellness will be escaped.
210+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
211+
# treated as '${Hostname}' itself on the command line.
201212

202213
set -- \
203214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
204215
-classpath "$CLASSPATH" \
205216
org.gradle.wrapper.GradleWrapperMain \
206217
"$@"
207218

219+
# Stop when "xargs" is not available.
220+
if ! command -v xargs >/dev/null 2>&1
221+
then
222+
die "xargs is not available"
223+
fi
224+
208225
# Use "xargs" to parse quoted args.
209226
#
210227
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.

‎gradlew.bat

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

17-
@if "%DEBUG%"=="" @echo off
19+
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################
1921
@rem
2022
@rem Gradle startup script for Windows
@@ -25,7 +27,8 @@
2527
if "%OS%"=="Windows_NT" setlocal
2628

2729
set DIRNAME=%~dp0
28-
if "%DIRNAME%" == "" set DIRNAME=.
30+
if "%DIRNAME%"=="" set DIRNAME=.
31+
@rem This is normally unused
2932
set APP_BASE_NAME=%~n0
3033
set APP_HOME=%DIRNAME%
3134

@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
4043

4144
set JAVA_EXE=java.exe
4245
%JAVA_EXE% -version >NUL 2>&1
43-
if "%ERRORLEVEL%"=="0" goto execute
46+
if %ERRORLEVEL%equ0 goto execute
4447

45-
echo.
46-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
47-
echo.
48-
echo Please set the JAVA_HOME variable in your environment to match the
49-
echo location of your Java installation.
48+
echo.1>&2
49+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.1>&2
50+
echo.1>&2
51+
echo Please set the JAVA_HOME variable in your environment to match the1>&2
52+
echo location of your Java installation.1>&2
5053

5154
goto fail
5255

@@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5659

5760
if exist "%JAVA_EXE%" goto execute
5861

59-
echo.
60-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
61-
echo.
62-
echo Please set the JAVA_HOME variable in your environment to match the
63-
echo location of your Java installation.
62+
echo.1>&2
63+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%1>&2
64+
echo.1>&2
65+
echo Please set the JAVA_HOME variable in your environment to match the1>&2
66+
echo location of your Java installation.1>&2
6467

6568
goto fail
6669

@@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
7578

7679
:end
7780
@rem End local scope for the variables with windows NT shell
78-
if "%ERRORLEVEL%"=="0" goto mainEnd
81+
if %ERRORLEVEL%equ0 goto mainEnd
7982

8083
:fail
8184
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
8285
rem the _cmd.exe /c_ return code!
83-
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
84-
exit /b 1
86+
set EXIT_CODE=%ERRORLEVEL%
87+
if %EXIT_CODE% equ 0 set EXIT_CODE=1
88+
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
89+
exit /b %EXIT_CODE%
8590

8691
:mainEnd
8792
if "%OS%"=="Windows_NT" endlocal

‎src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/lang/ParameterLanguageInjectorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void skipTestCssLanguageInjections() {
3737
assertInjectedLangAtCaret(PhpFileType.INSTANCE, base + "$c->toXPath('<caret>');", LANGUAGE_ID_CSS);
3838
}
3939

40-
public void testXPathLanguageInjections() {
40+
public void skipTestXPathLanguageInjections() {
4141
String base = "<?php $c = new \\Symfony\\Component\\DomCrawler\\Crawler();\n";
4242
assertInjectedLangAtCaret(PhpFileType.INSTANCE, base + "$c->filterXPath('//dum<caret>my');", LANGUAGE_ID_XPATH);
4343
assertInjectedLangAtCaret(PhpFileType.INSTANCE, base + "$c->filterXPath('<caret>');", LANGUAGE_ID_XPATH);

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /