diff --git a/.github/template-cleanup/gradle.properties b/.github/template-cleanup/gradle.properties index d3f39543..be51561d 100644 --- a/.github/template-cleanup/gradle.properties +++ b/.github/template-cleanup/gradle.properties @@ -7,19 +7,19 @@ pluginRepositoryUrl = https://github.com/%REPOSITORY% pluginVersion = 0.0.1 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html -pluginSinceBuild = 223 -pluginUntilBuild = 241.* +pluginSinceBuild = 232 +pluginUntilBuild = 242.* # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension platformType = IC -platformVersion = 2022.3.3 +platformVersion = 2023.2.6 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22 platformPlugins = # Gradle Releases -> https://github.com/gradle/gradle/releases -gradleVersion = 8.6 +gradleVersion = 8.7 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib kotlin.stdlib.default.dependency = false diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 63856f8b..38283686 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,7 +42,7 @@ jobs: # Validate wrapper - name: Gradle Wrapper Validation - uses: gradle/wrapper-validation-action@v2 + uses: gradle/actions/wrapper-validation@v3 # Set up Java environment for the next steps - name: Setup Java @@ -170,7 +170,7 @@ jobs: # Run Qodana inspections - name: Qodana - Code Inspection - uses: JetBrains/qodana-action@v2023.3.1 + uses: JetBrains/qodana-action@v2024.1.5 with: cache-default-branch-only: true diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml index 23d609d6..145a2aba 100644 --- a/.github/workflows/run-ui-tests.yml +++ b/.github/workflows/run-ui-tests.yml @@ -54,7 +54,7 @@ jobs: # Wait for IDEA to be started - name: Health Check - uses: jtalk/url-health-check-action@v3 + uses: jtalk/url-health-check-action@v4 with: url: http://127.0.0.1:8082 max-attempts: 15 diff --git a/CHANGELOG.md b/CHANGELOG.md index 355bf2e9..9f41925a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,21 @@ ## [Unreleased] +### Changed + +- Update `platformVersion` to `2023.2.6` +- Change since/until build to `232-242.*` (2023.2-2024.2.*) +- Upgrade Gradle Wrapper to `8.7` +- Update Kover configuration +- Replace `org.jetbrains:annotations` library with an `com.example:exampleLibrary` placeholder +- Dependencies - upgrade `org.jetbrains.intellij` to `1.17.3` +- Dependencies - upgrade `org.jetbrains.kotlin.jvm` to `2.0.0` +- Dependencies - upgrade `org.jetbrains.kotlinx.kover` to `0.8.0` +- Dependencies - upgrade `org.jetbrains.qodana` to `2024.1.5` +- Dependencies (GitHub Actions) - replace `gradle/wrapper-validation-action@v2` with `gradle/actions/wrapper-validation@v3` +- Dependencies (GitHub Actions) - upgrade `JetBrains/qodana-action` to `v2024.1.5` +- Dependencies (GitHub Actions) - upgrade `jtalk/url-health-check-action` to `v4` + ## [1.13.0] - 2024-03-11 ### Changed diff --git a/README.md b/README.md index d7f8cce0..f9ce3f6a 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,9 @@ All you have to do is click the Use this template button (you must be ![Use this template][file:use-this-template.png] 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. -Once this is complete, the project is ready to be cloned to your local environment and opened with [IntelliJ IDEA][jb:download-ij]. +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_. + +Now the project is ready to be cloned to your local environment and opened with [IntelliJ IDEA][jb:download-ij]. The most convenient way for getting your new project from GitHub is the Get from VCS action available on the Welcome Screen, where you can filter your GitHub repository by its name. @@ -129,7 +131,6 @@ In addition, extra behaviors are configured through the [`gradle.properties`][fi | `kotlin.stdlib.default.dependency` | `false` | Opt-out flag for bundling [Kotlin standard library][docs:kotlin-stdlib] | | `org.gradle.configuration-cache` | `true` | Enable [Gradle Configuration Cache][gradle:configuration-cache] | | `org.gradle.caching` | `true` | Enable [Gradle Build Cache][gradle:build-cache] | -| `systemProp.org.gradle.unsafe.kotlin.assignment` | `true` | Enable [Gradle Kotlin DSL Lazy Property Assignment][gradle:kotlin-dsl-assignment] | ### Environment variables diff --git a/build.gradle.kts b/build.gradle.kts index 7cc0417c..962daa41 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,7 +23,7 @@ repositories { // Dependencies are managed with Gradle version catalog - read more: https://docs.gradle.org/current/userguide/platforms.html#sub:version-catalog dependencies { -// implementation(libs.annotations) +// implementation(libs.exampleLibrary) } // Set the JVM language level used to build the project. @@ -48,10 +48,12 @@ changelog { } // Configure Gradle Kover Plugin - read more: https://github.com/Kotlin/kotlinx-kover#configuration -koverReport { - defaults { - xml { - onCheck = true +kover { + reports { + total { + xml { + onCheck = true + } } } } @@ -71,7 +73,7 @@ tasks { val start = "" val end = "" - with (it.lines()) { + with(it.lines()) { if (!containsAll(listOf(start, end))) { throw GradleException("Plugin description section not found in README.md:\n$start ... $end") } diff --git a/gradle.properties b/gradle.properties index e13e6c08..484a423f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,22 +4,22 @@ pluginGroup = org.jetbrains.plugins.template pluginName = IntelliJ Platform Plugin Template pluginRepositoryUrl = https://github.com/JetBrains/intellij-platform-plugin-template # SemVer format -> https://semver.org -pluginVersion = 1.13.0 +pluginVersion = 1.14.0 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html -pluginSinceBuild = 223 -pluginUntilBuild = 241.* +pluginSinceBuild = 232 +pluginUntilBuild = 242.* # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension platformType = IC -platformVersion = 2022.3.3 +platformVersion = 2023.2.6 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22 platformPlugins = # Gradle Releases -> https://github.com/gradle/gradle/releases -gradleVersion = 8.6 +gradleVersion = 8.7 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib kotlin.stdlib.default.dependency = false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 20c87492..0155a477 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,16 +1,16 @@ [versions] # libraries -annotations = "24.1.0" +exampleLibrary = "24.1.0" # plugins -kotlin = "1.9.23" +kotlin = "2.0.0" changelog = "2.2.0" -gradleIntelliJPlugin = "1.17.2" -qodana = "2023.3.1" -kover = "0.7.6" +gradleIntelliJPlugin = "1.17.3" +qodana = "2024.1.5" +kover = "0.8.0" [libraries] -annotations = { group = "org.jetbrains", name = "annotations", version.ref = "annotations" } +exampleLibrary = { group = "com.example", name = "exampleLibrary", version.ref = "exampleLibrary" } [plugins] changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd491..e6441136 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a80b22ce..b82aa23a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME