Skip to content

Commit 539ccd7

Browse files
marhalimarhali
authored
Merge pull request #452 from marhali/feat/update-intellij-platform
Feat/update intellij platform
2 parents 4efe615 + 4396ffa commit 539ccd7

20 files changed

+168
-169
lines changed

‎.github/workflows/build.yml

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ jobs:
3636
pluginVerifierHomeDir: ${{ steps.properties.outputs.pluginVerifierHomeDir }}
3737
steps:
3838

39-
# Check out current repository
39+
# Check out the current repository
4040
- name: Fetch Sources
4141
uses: actions/checkout@v4
4242

4343
# Validate wrapper
4444
- name: Gradle Wrapper Validation
45-
uses: gradle/wrapper-validation-action@v2
45+
uses: gradle/actions/wrapper-validation@v3
4646

4747
# Set up Java environment for the next steps
4848
- name: Setup Java
@@ -53,9 +53,7 @@ jobs:
5353

5454
# Setup Gradle
5555
- name: Setup Gradle
56-
uses: gradle/actions/setup-gradle@v3
57-
with:
58-
gradle-home-cache-cleanup: true
56+
uses: gradle/actions/setup-gradle@v4
5957

6058
# Set environment variables
6159
- name: Export Properties
@@ -73,8 +71,6 @@ jobs:
7371
echo "$CHANGELOG" >> $GITHUB_OUTPUT
7472
echo "EOF" >> $GITHUB_OUTPUT
7573
76-
./gradlew listProductsReleases # prepare list of IDEs for Plugin Verifier
77-
7874
# Build plugin
7975
- name: Build plugin
8076
run: ./gradlew buildPlugin
@@ -104,7 +100,7 @@ jobs:
104100
runs-on: ubuntu-latest
105101
steps:
106102

107-
# Check out current repository
103+
# Check out the current repository
108104
- name: Fetch Sources
109105
uses: actions/checkout@v4
110106

@@ -117,9 +113,7 @@ jobs:
117113

118114
# Setup Gradle
119115
- name: Setup Gradle
120-
uses: gradle/actions/setup-gradle@v3
121-
with:
122-
gradle-home-cache-cleanup: true
116+
uses: gradle/actions/setup-gradle@v4
123117

124118
# Run tests
125119
- name: Run Tests
@@ -157,9 +151,12 @@ jobs:
157151
tool-cache: false
158152
large-packages: false
159153

160-
# Check out current repository
154+
# Check out the current repository
161155
- name: Fetch Sources
162156
uses: actions/checkout@v4
157+
with:
158+
ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit
159+
fetch-depth: 0 # a full history is required for pull request analysis
163160

164161
# Set up Java environment for the next steps
165162
- name: Setup Java
@@ -170,7 +167,7 @@ jobs:
170167

171168
# Run Qodana inspections
172169
- name: Qodana - Code Inspection
173-
uses: JetBrains/qodana-action@v2023.3.1
170+
uses: JetBrains/qodana-action@v2024.2
174171
with:
175172
cache-default-branch-only: true
176173

@@ -188,7 +185,7 @@ jobs:
188185
tool-cache: false
189186
large-packages: false
190187

191-
# Check out current repository
188+
# Check out the current repository
192189
- name: Fetch Sources
193190
uses: actions/checkout@v4
194191

@@ -201,9 +198,7 @@ jobs:
201198

202199
# Setup Gradle
203200
- name: Setup Gradle
204-
uses: gradle/actions/setup-gradle@v3
205-
with:
206-
gradle-home-cache-cleanup: true
201+
uses: gradle/actions/setup-gradle@v4
207202

208203
# Cache Plugin Verifier IDEs
209204
- name: Setup Plugin Verifier IDEs Cache
@@ -214,7 +209,7 @@ jobs:
214209

215210
# Run Verify Plugin task and IntelliJ Plugin Verifier tool
216211
- name: Run Plugin Verification tasks
217-
run: ./gradlew runPluginVerifier -Dplugin.verifier.home.dir=${{ needs.build.outputs.pluginVerifierHomeDir }}
212+
run: ./gradlew verifyPlugin -Dplugin.verifier.home.dir=${{ needs.build.outputs.pluginVerifierHomeDir }}
218213

219214
# Collect Plugin Verifier Result
220215
- name: Collect Plugin Verifier Result
@@ -235,7 +230,7 @@ jobs:
235230
contents: write
236231
steps:
237232

238-
# Check out current repository
233+
# Check out the current repository
239234
- name: Fetch Sources
240235
uses: actions/checkout@v4
241236

‎.github/workflows/release.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
pull-requests: write
1919
steps:
2020

21-
# Check out current repository
21+
# Check out the current repository
2222
- name: Fetch Sources
2323
uses: actions/checkout@v4
2424
with:
@@ -33,9 +33,7 @@ jobs:
3333

3434
# Setup Gradle
3535
- name: Setup Gradle
36-
uses: gradle/actions/setup-gradle@v3
37-
with:
38-
gradle-home-cache-cleanup: true
36+
uses: gradle/actions/setup-gradle@v4
3937

4038
# Set environment variables
4139
- name: Export Properties
@@ -51,7 +49,7 @@ jobs:
5149
echo "$CHANGELOG" >> $GITHUB_OUTPUT
5250
echo "EOF" >> $GITHUB_OUTPUT
5351
54-
# Update Unreleased section with the current release note
52+
# Update the Unreleased section with the current release note
5553
- name: Patch Changelog
5654
if: ${{ steps.properties.outputs.changelog != '' }}
5755
env:

‎.github/workflows/run-ui-tests.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
steps:
3333

34-
# Check out current repository
34+
# Check out the current repository
3535
- name: Fetch Sources
3636
uses: actions/checkout@v4
3737

@@ -44,17 +44,15 @@ jobs:
4444

4545
# Setup Gradle
4646
- name: Setup Gradle
47-
uses: gradle/actions/setup-gradle@v3
48-
with:
49-
gradle-home-cache-cleanup: true
47+
uses: gradle/actions/setup-gradle@v4
5048

5149
# Run IDEA prepared for UI testing
5250
- name: Run IDE
5351
run: ${{ matrix.runIde }}
5452

5553
# Wait for IDEA to be started
5654
- name: Health Check
57-
uses: jtalk/url-health-check-action@v3
55+
uses: jtalk/url-health-check-action@v4
5856
with:
5957
url: http://127.0.0.1:8082
6058
max-attempts: 15

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.gradle
22
.idea
3+
.intellijPlatform
34
.qodana
45
build

‎.run/Run IDE for UI Tests.run.xml

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎.run/Run Plugin.run.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Run Plugin" type="GradleRunConfiguration" factoryName="Gradle">
3-
<log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log" />
3+
<log_file alias="IDE logs" path="$PROJECT_DIR$/build/idea-sandbox/*/log/idea.log" show_all="true" />
44
<ExternalSystemSettings>
55
<option name="executionName" />
66
<option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -19,6 +19,7 @@
1919
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
2020
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
2121
<DebugAllEnabled>false</DebugAllEnabled>
22+
<RunAsTest>false</RunAsTest>
2223
<method v="2" />
2324
</configuration>
2425
</component>

‎.run/Run Qodana.run.xml

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎.run/Run Tests.run.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<component name="ProjectRunConfigurationManager">
2-
<configuration default="false" name="Run Verifications" type="GradleRunConfiguration" factoryName="Gradle">
2+
<configuration default="false" name="Run Tests" type="GradleRunConfiguration" factoryName="Gradle">
33
<log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log" />
44
<ExternalSystemSettings>
55
<option name="executionName" />
@@ -11,16 +11,15 @@
1111
</option>
1212
<option name="taskNames">
1313
<list>
14-
<option value="runPluginVerifier" />
14+
<option value="check" />
1515
</list>
1616
</option>
1717
<option name="vmOptions" value="" />
1818
</ExternalSystemSettings>
1919
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
2020
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
2121
<DebugAllEnabled>false</DebugAllEnabled>
22-
<method v="2">
23-
<option name="Gradle.BeforeRunTask" enabled="true" tasks="clean" externalProjectPath="$PROJECT_DIR$" vmOptions="" scriptParameters="" />
24-
</method>
22+
<RunAsTest>true</RunAsTest>
23+
<method v="2" />
2524
</configuration>
2625
</component>

‎.run/Run Verifications.run.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,15 @@
1111
</option>
1212
<option name="taskNames">
1313
<list>
14-
<option value="runPluginVerifier" />
14+
<option value="verifyPlugin" />
1515
</list>
1616
</option>
1717
<option name="vmOptions" value="" />
1818
</ExternalSystemSettings>
1919
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
2020
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
2121
<DebugAllEnabled>false</DebugAllEnabled>
22-
<method v="2">
23-
<option name="Gradle.BeforeRunTask" enabled="true" tasks="clean" externalProjectPath="$PROJECT_DIR$" vmOptions="" scriptParameters="" />
24-
</method>
22+
<RunAsTest>false</RunAsTest>
23+
<method v="2" />
2524
</configuration>
2625
</component>

‎CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@
44

55
## [Unreleased]
66

7+
### Added
8+
9+
- Support for IntelliJ Platform version 2024.3
10+
11+
### Changed
12+
13+
- Require at least IntelliJ Platform version 2023.3.8
14+
- Remove deprecated api usage
15+
716
## [4.6.0] - 2024-05-31
817

918
### Added

0 commit comments

Comments
 (0)