Skip to content

Commit 98a0b72

Browse files
hszhsz
authored
Merge pull request #551 from JetBrains/next
next
2 parents ae051ed + 01b925e commit 98a0b72

File tree

16 files changed

+71
-54
lines changed

16 files changed

+71
-54
lines changed

‎.github/template-cleanup/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ To keep everything working, do not remove `<!-- ... -->` sections.
2828
## Installation
2929

3030
- Using the IDE built-in plugin system:
31-
31+
3232
<kbd>Settings/Preferences</kbd> > <kbd>Plugins</kbd> > <kbd>Marketplace</kbd> > <kbd>Search for "%NAME%"</kbd> >
3333
<kbd>Install</kbd>
34-
34+
3535
- Using JetBrains Marketplace:
3636

3737
Go to [JetBrains Marketplace](https://plugins.jetbrains.com/plugin/MARKETPLACE_ID) and install it by clicking the <kbd>Install to ...</kbd> button in case your IDE is running.

‎.github/template-cleanup/gradle.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ pluginRepositoryUrl = https://github.com/%REPOSITORY%
77
pluginVersion = 0.0.1
88

99
# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
10-
pluginSinceBuild = 243
10+
pluginSinceBuild = 251
1111

1212
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
1313
platformType = IC
14-
platformVersion = 2024.3.6
14+
platformVersion = 2025.1.7
1515

1616
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
1717
# Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP
@@ -22,7 +22,7 @@ platformBundledPlugins =
2222
platformBundledModules =
2323

2424
# Gradle Releases -> https://github.com/gradle/gradle/releases
25-
gradleVersion = 9.0.0
25+
gradleVersion = 9.2.1
2626

2727
# Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
2828
kotlin.stdlib.default.dependency = false

‎.github/workflows/build.yml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on:
2323
concurrency:
2424
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
2525
cancel-in-progress: true
26-
26+
2727
jobs:
2828

2929
# Prepare the environment and build the plugin
@@ -41,18 +41,18 @@ jobs:
4141

4242
# Check out the current repository
4343
- name: Fetch Sources
44-
uses: actions/checkout@v4
44+
uses: actions/checkout@v5
4545

4646
# Set up the Java environment for the next steps
4747
- name: Setup Java
48-
uses: actions/setup-java@v4
48+
uses: actions/setup-java@v5
4949
with:
5050
distribution: zulu
5151
java-version: 21
5252

5353
# Setup Gradle
5454
- name: Setup Gradle
55-
uses: gradle/actions/setup-gradle@v4
55+
uses: gradle/actions/setup-gradle@v5
5656

5757
# Build plugin
5858
- name: Build plugin
@@ -71,7 +71,7 @@ jobs:
7171
7272
# Store an already-built plugin as an artifact for downloading
7373
- name: Upload artifact
74-
uses: actions/upload-artifact@v4
74+
uses: actions/upload-artifact@v5
7575
with:
7676
name: ${{ steps.artifact.outputs.filename }}
7777
path: ./build/distributions/content/*/*
@@ -92,18 +92,18 @@ jobs:
9292

9393
# Check out the current repository
9494
- name: Fetch Sources
95-
uses: actions/checkout@v4
95+
uses: actions/checkout@v5
9696

9797
# Set up the Java environment for the next steps
9898
- name: Setup Java
99-
uses: actions/setup-java@v4
99+
uses: actions/setup-java@v5
100100
with:
101101
distribution: zulu
102102
java-version: 21
103103

104104
# Setup Gradle
105105
- name: Setup Gradle
106-
uses: gradle/actions/setup-gradle@v4
106+
uses: gradle/actions/setup-gradle@v5
107107
with:
108108
cache-read-only: true
109109

@@ -114,7 +114,7 @@ jobs:
114114
# Collect Tests Result of failed tests
115115
- name: Collect Tests Result
116116
if: ${{ failure() }}
117-
uses: actions/upload-artifact@v4
117+
uses: actions/upload-artifact@v5
118118
with:
119119
name: tests-result
120120
path: ${{ github.workspace }}/build/reports/tests
@@ -146,14 +146,14 @@ jobs:
146146

147147
# Check out the current repository
148148
- name: Fetch Sources
149-
uses: actions/checkout@v4
149+
uses: actions/checkout@v5
150150
with:
151-
ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit
152-
fetch-depth: 0 # a full history is required for pull request analysis
151+
ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit
152+
fetch-depth: 0 # a full history is required for pull request analysis
153153

154154
# Set up the Java environment for the next steps
155155
- name: Setup Java
156-
uses: actions/setup-java@v4
156+
uses: actions/setup-java@v5
157157
with:
158158
distribution: zulu
159159
java-version: 21
@@ -180,18 +180,18 @@ jobs:
180180

181181
# Check out the current repository
182182
- name: Fetch Sources
183-
uses: actions/checkout@v4
183+
uses: actions/checkout@v5
184184

185185
# Set up the Java environment for the next steps
186186
- name: Setup Java
187-
uses: actions/setup-java@v4
187+
uses: actions/setup-java@v5
188188
with:
189189
distribution: zulu
190190
java-version: 21
191191

192192
# Setup Gradle
193193
- name: Setup Gradle
194-
uses: gradle/actions/setup-gradle@v4
194+
uses: gradle/actions/setup-gradle@v5
195195
with:
196196
cache-read-only: true
197197

@@ -202,7 +202,7 @@ jobs:
202202
# Collect Plugin Verifier Result
203203
- name: Collect Plugin Verifier Result
204204
if: ${{ always() }}
205-
uses: actions/upload-artifact@v4
205+
uses: actions/upload-artifact@v5
206206
with:
207207
name: pluginVerifier-result
208208
path: ${{ github.workspace }}/build/reports/pluginVerifier
@@ -220,7 +220,7 @@ jobs:
220220

221221
# Check out the current repository
222222
- name: Fetch Sources
223-
uses: actions/checkout@v4
223+
uses: actions/checkout@v5
224224

225225
# Remove old release drafts by using the curl request for the available releases with a draft flag
226226
- name: Remove Old Release Drafts
@@ -239,7 +239,7 @@ jobs:
239239
VERSION=$(./gradlew properties --property version --quiet --console=plain | tail -n 1 | cut -f2- -d ' ')
240240
RELEASE_NOTE="./build/tmp/release_note.txt"
241241
./gradlew getChangelog --unreleased --no-header --quiet --console=plain --output-file=$RELEASE_NOTE
242-
242+
243243
gh release create $VERSION \
244244
--draft \
245245
--title $VERSION \

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,20 @@ jobs:
2727

2828
# Check out the current repository
2929
- name: Fetch Sources
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v5
3131
with:
3232
ref: ${{ github.event.release.tag_name }}
3333

3434
# Set up the Java environment for the next steps
3535
- name: Setup Java
36-
uses: actions/setup-java@v4
36+
uses: actions/setup-java@v5
3737
with:
3838
distribution: zulu
3939
java-version: 21
4040

4141
# Setup Gradle
4242
- name: Setup Gradle
43-
uses: gradle/actions/setup-gradle@v4
43+
uses: gradle/actions/setup-gradle@v5
4444
with:
4545
cache-read-only: true
4646

@@ -87,7 +87,7 @@ jobs:
8787
git checkout -b $BRANCH
8888
git commit -am "Changelog update - $VERSION"
8989
git push --set-upstream origin $BRANCH
90-
90+
9191
gh label create "$LABEL" \
9292
--description "Pull requests with release changelog update" \
9393
--force \

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@ jobs:
3333

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

3838
# Set up the Java environment for the next steps
3939
- name: Setup Java
40-
uses: actions/setup-java@v4
40+
uses: actions/setup-java@v5
4141
with:
4242
distribution: zulu
4343
java-version: 21
4444

4545
# Setup Gradle
4646
- name: Setup Gradle
47-
uses: gradle/actions/setup-gradle@v4
47+
uses: gradle/actions/setup-gradle@v5
4848
with:
4949
cache-read-only: true
5050

‎.github/workflows/template-cleanup.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
# Check out the current repository
2121
- name: Fetch Sources
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@v5
2323

2424
# Cleanup project
2525
- name: Cleanup

‎.github/workflows/template-verify.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ jobs:
2323

2424
# Check out the current repository
2525
- name: Fetch Sources
26-
uses: actions/checkout@v4
26+
uses: actions/checkout@v5
2727

2828
# Compare `gradle.properties` with `.github/template-cleanup/gradle.properties`
2929
- name: Verify gradle.properties
3030
run: |
3131
echo "\`\`\`diff" >> $GITHUB_STEP_SUMMARY
32-
32+
3333
diff -U 0 \
3434
-I '^pluginVersion' \
3535
-I '^pluginGroup' \
@@ -39,5 +39,5 @@ jobs:
3939
--label gradle.properties \
4040
.github/template-cleanup/gradle.properties gradle.properties \
4141
>> $GITHUB_STEP_SUMMARY
42-
42+
4343
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY

‎CHANGELOG.md‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,26 @@
44

55
## [Unreleased]
66

7+
### Fixed
8+
9+
- Use the GitHub event release body for a condition when creating the Release Draft
10+
11+
### Changed
12+
13+
- Upgrade Gradle Wrapper to `9.2.1`
14+
- Update `platformVersion` to `2025.1.7`
15+
- Change since build to `251` (2025.1)
16+
- Dependencies - upgrade `org.jetbrains.intellij.platform` to `2.10.4`
17+
- Dependencies - upgrade `org.jetbrains.kotlinx.kover` to `0.9.3`
18+
- Dependencies - upgrade `org.jetbrains.qodana` to `2025.2.1`
19+
- Dependencies (GitHub Actions) - upgrade `actions/checkout` to `v5`
20+
- Dependencies (GitHub Actions) - upgrade `actions/setup-java` to `v5`
21+
- Dependencies (GitHub Actions) - upgrade `actions/upload-artifact` to `v5`
22+
- Dependencies (GitHub Actions) - upgrade `gradle/actions/setup-gradle` to `v5`
23+
- Dependencies (GitHub Actions) - upgrade `JetBrains/qodana-action` to `v2025.2.2`
24+
25+
## [2.3.1] - 2025-08-09
26+
727
### Added
828

929
- Add `platformBundledModules` to `gradle.properties` along with `bundledModules()` helper to the Gradle build file
@@ -848,7 +868,8 @@
848868
- GitHub Actions to automate testing and deployment
849869
- Kotlin support
850870

851-
[Unreleased]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v2.3.0...HEAD
871+
[Unreleased]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v2.3.1...HEAD
872+
[2.3.1]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v2.3.0...v2.3.1
852873
[2.3.0]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v2.2.0...v2.3.0
853874
[2.2.0]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v2.1.0...v2.2.0
854875
[2.1.0]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v2.0.2...v2.1.0

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,11 +195,11 @@ It provides general information about the plugin, its dependencies, extensions,
195195
<id>org.jetbrains.plugins.template</id>
196196
<name>Template</name>
197197
<vendor>JetBrains</vendor>
198-
198+
199199
<depends>com.intellij.modules.platform</depends>
200200

201201
<resource-bundle>messages.MyBundle</resource-bundle>
202-
202+
203203
<extensions defaultExtensionNs="com.intellij">
204204
<toolWindow factoryClass="..." id="..."/>
205205
</extensions>

‎build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ repositories {
2929
}
3030
}
3131

32-
// Dependencies are managed with Gradle version catalog - read more: https://docs.gradle.org/current/userguide/platforms.html#sub:version-catalog
32+
// Dependencies are managed with Gradle version catalog - read more: https://docs.gradle.org/current/userguide/version_catalogs.html
3333
dependencies {
3434
testImplementation(libs.junit)
3535
testImplementation(libs.opentest4j)
@@ -98,7 +98,7 @@ intellijPlatform {
9898
token = providers.environmentVariable("PUBLISH_TOKEN")
9999
// The pluginVersion is based on the SemVer (https://semver.org) and supports pre-release labels, like 2.1.7-alpha.3
100100
// Specify pre-release label to publish the plugin in a custom Release Channel automatically. Read more:
101-
// https://plugins.jetbrains.com/docs/intellij/deployment.html#specifying-a-release-channel
101+
// https://plugins.jetbrains.com/docs/intellij/publishing-plugin.html#specifying-a-release-channel
102102
channels = providers.gradleProperty("pluginVersion").map { listOf(it.substringAfter('-', "").substringBefore('.').ifEmpty { "default" }) }
103103
}
104104

@@ -115,7 +115,7 @@ changelog {
115115
repositoryUrl = providers.gradleProperty("pluginRepositoryUrl")
116116
}
117117

118-
// Configure Gradle Kover Plugin - read more: https://github.com/Kotlin/kotlinx-kover#configuration
118+
// Configure Gradle Kover Plugin - read more: https://kotlin.github.io/kotlinx-kover/gradle-plugin/#configuration-details
119119
kover {
120120
reports {
121121
total {

0 commit comments

Comments
 (0)