From 1c8a295dec7607a20551b9aaec1a8d4938ef8b4c Mon Sep 17 00:00:00 2001 From: InSync Date: Mon, 28 Jul 2025 06:55:46 +0000 Subject: [PATCH] chore: Synchronize with template --- .github/workflows/ci_intellij_plugin.yml | 29 ++++++++---------- editors/intellij/build.gradle.kts | 1 - editors/intellij/gradle/libs.versions.toml | 4 +-- .../gradle/wrapper/gradle-wrapper.jar | Bin 43705 -> 43764 bytes editors/intellij/gradlew | 4 +-- editors/intellij/gradlew.bat | 4 +-- 6 files changed, 18 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci_intellij_plugin.yml b/.github/workflows/ci_intellij_plugin.yml index 6b6e67a5..ad75665b 100644 --- a/.github/workflows/ci_intellij_plugin.yml +++ b/.github/workflows/ci_intellij_plugin.yml @@ -21,18 +21,15 @@ jobs: name: Build runs-on: ubuntu-latest - outputs: - pluginVerifierHomeDir: ${{ steps.properties.outputs.pluginVerifierHomeDir }} - steps: - name: Fetch sources uses: actions/checkout@v4 - - name: Setup Java + - name: Set up Java uses: actions/setup-java@v4 with: distribution: zulu java-version: 21 - - name: Setup Gradle + - name: Set up Gradle uses: gradle/actions/setup-gradle@v4 - name: Export properties id: properties @@ -41,7 +38,6 @@ jobs: run: | chmod +x ./gradlew PROPERTIES="$(./gradlew properties --console=plain -q)" - echo "pluginVerifierHomeDir=~/.pluginVerifier" >> $GITHUB_OUTPUT - name: Build plugin working-directory: ./editors/intellij run: | @@ -73,14 +69,16 @@ jobs: steps: - name: Fetch sources uses: actions/checkout@v4 - - name: Setup Java + - name: Set up Java uses: actions/setup-java@v4 with: distribution: zulu java-version: 21 - - name: Setup Gradle + - name: Set up Gradle uses: gradle/actions/setup-gradle@v4 - - name: Setup Tombi + with: + cache-read-only: true + - name: Set up Tombi uses: tombi-toml/setup-tombi@v1 - name: Run tests working-directory: ./editors/intellij @@ -114,7 +112,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 - - name: Setup Java + - name: Set up Java uses: actions/setup-java@v4 with: distribution: zulu @@ -138,24 +136,21 @@ jobs: large-packages: false - name: Fetch sources uses: actions/checkout@v4 - - name: Setup Java + - name: Set up Java uses: actions/setup-java@v4 with: distribution: zulu java-version: 21 - - name: Setup Gradle + - name: Set up Gradle uses: gradle/actions/setup-gradle@v4 - - name: Setup IDEs cache - uses: actions/cache@v4 with: - path: ${{ needs.build.outputs.pluginVerifierHomeDir }}/ides - key: plugin-verifier-${{ hashFiles('build/listProductsReleases.txt') }} + cache-read-only: true - name: Run verifier continue-on-error: true working-directory: ./editors/intellij run: | chmod +x ./gradlew - ./gradlew verifyPlugin -Dplugin.verifier.home.dir=${{ needs.build.outputs.pluginVerifierHomeDir }} + ./gradlew verifyPlugin - name: Upload result if: always() uses: actions/upload-artifact@v4 diff --git a/editors/intellij/build.gradle.kts b/editors/intellij/build.gradle.kts index a0afa4f6..6febbf29 100644 --- a/editors/intellij/build.gradle.kts +++ b/editors/intellij/build.gradle.kts @@ -99,7 +99,6 @@ intellijPlatform { ideaVersion { sinceBuild = providers.gradleProperty("pluginSinceBuild") - untilBuild = providers.gradleProperty("pluginUntilBuild") } } diff --git a/editors/intellij/gradle/libs.versions.toml b/editors/intellij/gradle/libs.versions.toml index 0a9fe98c..49707378 100644 --- a/editors/intellij/gradle/libs.versions.toml +++ b/editors/intellij/gradle/libs.versions.toml @@ -3,8 +3,8 @@ annotations = "26.0.2" junit = "4.13.2" # plugins -changelog = "2.2.1" -intelliJPlatform = "2.6.0" +changelog = "2.3.0" +intelliJPlatform = "2.7.0" kotlin = "2.2.0" kover = "0.9.1" qodana = "2025.1.1" diff --git a/editors/intellij/gradle/wrapper/gradle-wrapper.jar b/editors/intellij/gradle/wrapper/gradle-wrapper.jar index 9bbc975c742b298b441bfb90dbc124400a3751b9..1b33c55baabb587c669f562ae36f953de2481846 100644 GIT binary patch delta 642 zcmdmamFde>rVZJA^}0Q$xegf!xPEW^+5YDM%iT2bEgct9o+jH~+sJas#HZ=szO|** z=Pj=X_vx?W&DSwKck|WWn~hffsvnQ+42*W$b7b0$SCcOoZ`{W{^$^pk;4>8-A*-)$ z?n(Po`1$6Jn_u?t-L+tsPyZ2#X}8T6OS8pAU;kdgd+_Hw4z4TW0p9E!T+=f7-c&O% zFic^X{7^$?^Ho04eona9n#mGMxKhA=~8B%JN`M zMhm5wc-2v)$``sY$!Q`9xiU@DhI73ZxiGEKg>yIPs)NmWwMdF-ngLXpZSqV5ez36n zVkxF2rjrjWR+_xr6e6@_u@s~2uv{9vi*1pj2)BjFD+-%@&pRVP1f{O1glxTOp2-62Ph;v z`N1+vCd)9ea)af*Ol1*JCfnp$%Uu}%OuoN7g2}3C@`L5FlP#(sA=|h@iixuZC?qp^ z=L$=v$ZoI}|87Wh=&h7udff{aieKr*l+zDp?pf)_bbRvUf>kn;HCDMXNlgbbo!QRK I1x7am0No)LiU0rr delta 584 zcmexzm1*ZyrVZJAexH5Moc8h7)w{^+t*dqJ%=yhh23L$9JpFV=_k`zJ-?Q4DI*eSe z+ES)HSrVnWLtJ&)lO%hRkV9zl5qqWRt0e;bb zPPo`)y?HTAyZI&u&X<|2$FDHCf4;!v8}p=?Tm`^F0`u(|1ttf~&t$qP3KUSD>@TJQ zRwJ}Pim6NzEc8KA6)e;S6gs8=7IIL8sQL*MYEuRYO;Uj<%3UbMbV&^&!Zvx+LKmjT z8Zch6rYP7Tw?$Hn(UTJwWiS=$f{lB(C=e*%usDV})0AQIK~sat=ND@+Gg*Pyij!rR z*fa02W|%BsV++>4W{DKDGSIUEHd2$P+8ct!RF+CHDowUuTEZOZ%rJSQv*qOXOSPDN zT|sP-$p*_3ncsWB*qoD7JQcyZ9xan%cJP6Tb4-?AZpr*F6v98hoNaPJm@HV`yya5N z))6pqFXn@}P(3T0nEzM8*c_9KtE9o|_pFd&K35GBXP^9Kg(b6GH-z8S4GDzIl~T+b zdLd#meKKHu$5u))8cu$=GKINkGDPOUD)!0$C(BH(U!}!-e;Q0ok8Sc?V1zRO04>ts AA^-pY diff --git a/editors/intellij/gradlew b/editors/intellij/gradlew index faf93008..23d15a93 100644 --- a/editors/intellij/gradlew +++ b/editors/intellij/gradlew @@ -114,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/editors/intellij/gradlew.bat b/editors/intellij/gradlew.bat index 9d21a218..db3a6ac2 100644 --- a/editors/intellij/gradlew.bat +++ b/editors/intellij/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell