Skip to content

Commit 47b2d17

Browse files
authored
Merge pull request #456 from JetBrains/next
2 parents 9726f52 + 6253262 commit 47b2d17

File tree

10 files changed

+45
-27
lines changed

10 files changed

+45
-27
lines changed

.github/template-cleanup/gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ 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 = 223
11-
pluginUntilBuild = 241.*
10+
pluginSinceBuild = 232
11+
pluginUntilBuild = 242.*
1212

1313
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
1414
platformType = IC
15-
platformVersion = 2022.3.3
15+
platformVersion = 2023.2.6
1616

1717
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
1818
# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
1919
platformPlugins =
2020

2121
# Gradle Releases -> https://github.com/gradle/gradle/releases
22-
gradleVersion = 8.6
22+
gradleVersion = 8.7
2323

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

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
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
@@ -170,7 +170,7 @@ jobs:
170170

171171
# Run Qodana inspections
172172
- name: Qodana - Code Inspection
173-
uses: JetBrains/qodana-action@v2023.3.1
173+
uses: JetBrains/qodana-action@v2024.1.5
174174
with:
175175
cache-default-branch-only: true
176176

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

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

5555
# Wait for IDEA to be started
5656
- name: Health Check
57-
uses: jtalk/url-health-check-action@v3
57+
uses: jtalk/url-health-check-action@v4
5858
with:
5959
url: http://127.0.0.1:8082
6060
max-attempts: 15

CHANGELOG.md

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

55
## [Unreleased]
66

7+
### Changed
8+
9+
- Update `platformVersion` to `2023.2.6`
10+
- Change since/until build to `232-242.*` (2023.2-2024.2.*)
11+
- Upgrade Gradle Wrapper to `8.7`
12+
- Update Kover configuration
13+
- Replace `org.jetbrains:annotations` library with an `com.example:exampleLibrary` placeholder
14+
- Dependencies - upgrade `org.jetbrains.intellij` to `1.17.3`
15+
- Dependencies - upgrade `org.jetbrains.kotlin.jvm` to `2.0.0`
16+
- Dependencies - upgrade `org.jetbrains.kotlinx.kover` to `0.8.0`
17+
- Dependencies - upgrade `org.jetbrains.qodana` to `2024.1.5`
18+
- Dependencies (GitHub Actions) - replace `gradle/wrapper-validation-action@v2` with `gradle/actions/wrapper-validation@v3`
19+
- Dependencies (GitHub Actions) - upgrade `JetBrains/qodana-action` to `v2024.1.5`
20+
- Dependencies (GitHub Actions) - upgrade `jtalk/url-health-check-action` to `v4`
21+
722
## [1.13.0] - 2024-03-11
823

924
### Changed

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ All you have to do is click the <kbd>Use this template</kbd> button (you must be
6464
![Use this template][file:use-this-template.png]
6565

6666
After using the template to create your blank project, the [Template Cleanup][file:template_cleanup.yml] workflow will be triggered to override or remove any template-specific configurations, such as the plugin name, current changelog, etc.
67-
Once this is complete, the project is ready to be cloned to your local environment and opened with [IntelliJ IDEA][jb:download-ij].
67+
Once this is complete, open the newly created project's _Settings | Actions | General_ page and enable option _Allow GitHub Actions to create and approve pull requests_.
68+
69+
Now the project is ready to be cloned to your local environment and opened with [IntelliJ IDEA][jb:download-ij].
6870

6971
The most convenient way for getting your new project from GitHub is the <kbd>Get from VCS</kbd> action available on the Welcome Screen, where you can filter your GitHub repository by its name.
7072

@@ -129,7 +131,6 @@ In addition, extra behaviors are configured through the [`gradle.properties`][fi
129131
| `kotlin.stdlib.default.dependency` | `false` | Opt-out flag for bundling [Kotlin standard library][docs:kotlin-stdlib] |
130132
| `org.gradle.configuration-cache` | `true` | Enable [Gradle Configuration Cache][gradle:configuration-cache] |
131133
| `org.gradle.caching` | `true` | Enable [Gradle Build Cache][gradle:build-cache] |
132-
| `systemProp.org.gradle.unsafe.kotlin.assignment` | `true` | Enable [Gradle Kotlin DSL Lazy Property Assignment][gradle:kotlin-dsl-assignment] |
133134

134135
### Environment variables
135136

build.gradle.kts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ repositories {
2323

2424
// Dependencies are managed with Gradle version catalog - read more: https://docs.gradle.org/current/userguide/platforms.html#sub:version-catalog
2525
dependencies {
26-
// implementation(libs.annotations)
26+
// implementation(libs.exampleLibrary)
2727
}
2828

2929
// Set the JVM language level used to build the project.
@@ -48,10 +48,12 @@ changelog {
4848
}
4949

5050
// Configure Gradle Kover Plugin - read more: https://github.com/Kotlin/kotlinx-kover#configuration
51-
koverReport {
52-
defaults {
53-
xml {
54-
onCheck = true
51+
kover {
52+
reports {
53+
total {
54+
xml {
55+
onCheck = true
56+
}
5557
}
5658
}
5759
}
@@ -71,7 +73,7 @@ tasks {
7173
val start = "<!-- Plugin description -->"
7274
val end = "<!-- Plugin description end -->"
7375

74-
with (it.lines()) {
76+
with(it.lines()) {
7577
if (!containsAll(listOf(start, end))) {
7678
throw GradleException("Plugin description section not found in README.md:\n$start ... $end")
7779
}

gradle.properties

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@ pluginGroup = org.jetbrains.plugins.template
44
pluginName = IntelliJ Platform Plugin Template
55
pluginRepositoryUrl = https://github.com/JetBrains/intellij-platform-plugin-template
66
# SemVer format -> https://semver.org
7-
pluginVersion = 1.13.0
7+
pluginVersion = 1.14.0
88

99
# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
10-
pluginSinceBuild = 223
11-
pluginUntilBuild = 241.*
10+
pluginSinceBuild = 232
11+
pluginUntilBuild = 242.*
1212

1313
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
1414
platformType = IC
15-
platformVersion = 2022.3.3
15+
platformVersion = 2023.2.6
1616

1717
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
1818
# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
1919
platformPlugins =
2020

2121
# Gradle Releases -> https://github.com/gradle/gradle/releases
22-
gradleVersion = 8.6
22+
gradleVersion = 8.7
2323

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

gradle/libs.versions.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
[versions]
22
# libraries
3-
annotations = "24.1.0"
3+
exampleLibrary = "24.1.0"
44

55
# plugins
6-
kotlin = "1.9.23"
6+
kotlin = "2.0.0"
77
changelog = "2.2.0"
8-
gradleIntelliJPlugin = "1.17.2"
9-
qodana = "2023.3.1"
10-
kover = "0.7.6"
8+
gradleIntelliJPlugin = "1.17.3"
9+
qodana = "2024.1.5"
10+
kover = "0.8.0"
1111

1212
[libraries]
13-
annotations = { group = "org.jetbrains", name = "annotations", version.ref = "annotations" }
13+
exampleLibrary = { group = "com.example", name = "exampleLibrary", version.ref = "exampleLibrary" }
1414

1515
[plugins]
1616
changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }

gradle/wrapper/gradle-wrapper.jar

-9 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)