diff --git a/.github/template-cleanup/README.md b/.github/template-cleanup/README.md index 0f703da..e348300 100644 --- a/.github/template-cleanup/README.md +++ b/.github/template-cleanup/README.md @@ -1,17 +1,17 @@ # %NAME% ![Build](https://github.com/%REPOSITORY%/workflows/Build/badge.svg) -[![Version](https://img.shields.io/jetbrains/plugin/v/PLUGIN_ID.svg)](https://plugins.jetbrains.com/plugin/PLUGIN_ID) -[![Downloads](https://img.shields.io/jetbrains/plugin/d/PLUGIN_ID.svg)](https://plugins.jetbrains.com/plugin/PLUGIN_ID) +[![Version](https://img.shields.io/jetbrains/plugin/v/MARKETPLACE_ID.svg)](https://plugins.jetbrains.com/plugin/MARKETPLACE_ID) +[![Downloads](https://img.shields.io/jetbrains/plugin/d/MARKETPLACE_ID.svg)](https://plugins.jetbrains.com/plugin/MARKETPLACE_ID) ## Template ToDo list - [x] Create a new [IntelliJ Platform Plugin Template][template] project. - [ ] Get familiar with the [template documentation][template]. -- [ ] Adjust the [pluginGroup](./gradle.properties), [plugin ID](./src/main/resources/META-INF/plugin.xml) and [sources package](./src/main/kotlin). +- [ ] Adjust the [pluginGroup](./gradle.properties) and [pluginName](./gradle.properties), as well as the [id](./src/main/resources/META-INF/plugin.xml) and [sources package](./src/main/kotlin). - [ ] Adjust the plugin description in `README` (see [Tips][docs:plugin-description]) - [ ] Review the [Legal Agreements](https://plugins.jetbrains.com/docs/marketplace/legal-agreements.html?from=IJPluginTemplate). - [ ] [Publish a plugin manually](https://plugins.jetbrains.com/docs/intellij/publishing-plugin.html?from=IJPluginTemplate) for the first time. -- [ ] Set the `PLUGIN_ID` in the above README badges. +- [ ] Set the `MARKETPLACE_ID` in the above README badges. You can obtain it once the plugin is published to the marketplace. - [ ] Set the [Plugin Signing](https://plugins.jetbrains.com/docs/intellij/plugin-signing.html?from=IJPluginTemplate) related [secrets](https://github.com/JetBrains/intellij-platform-plugin-template#environment-variables). - [ ] Set the [Deployment Token](https://plugins.jetbrains.com/docs/marketplace/plugin-upload.html?from=IJPluginTemplate). - [ ] Click the Watch button on the top of the [IntelliJ Platform Plugin Template][template] to be notified about releases containing new features and fixes. diff --git a/.github/template-cleanup/gradle.properties b/.github/template-cleanup/gradle.properties index 456d9e8..8c168fc 100644 --- a/.github/template-cleanup/gradle.properties +++ b/.github/template-cleanup/gradle.properties @@ -12,7 +12,7 @@ pluginUntilBuild = 242.* # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension platformType = IC -platformVersion = 2023.2.6 +platformVersion = 2023.2.7 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html # Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP @@ -21,7 +21,7 @@ platformPlugins = platformBundledPlugins = # Gradle Releases -> https://github.com/gradle/gradle/releases -gradleVersion = 8.8 +gradleVersion = 8.9 # 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/release.yml b/.github/workflows/release.yml index d3d4bcf..aa06cb2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ jobs: pull-requests: write steps: - # Check out current repository + # Check out the current repository - name: Fetch Sources uses: actions/checkout@v4 with: diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml index d9a72b9..a6c55ea 100644 --- a/.github/workflows/run-ui-tests.yml +++ b/.github/workflows/run-ui-tests.yml @@ -31,7 +31,7 @@ jobs: steps: - # Check out current repository + # Check out the current repository - name: Fetch Sources uses: actions/checkout@v4 diff --git a/.github/workflows/template-cleanup.yml b/.github/workflows/template-cleanup.yml index 360f30b..abb6134 100644 --- a/.github/workflows/template-cleanup.yml +++ b/.github/workflows/template-cleanup.yml @@ -17,7 +17,7 @@ jobs: contents: write steps: - # Check out current repository + # Check out the current repository - name: Fetch Sources uses: actions/checkout@v4 @@ -61,7 +61,6 @@ jobs: .idea/icon.png \ src/main/kotlin/org \ src/test/kotlin/org \ - src/main/resources/META-INF/pluginIcon.svg \ CODE_OF_CONDUCT.md \ LICENSE diff --git a/.github/workflows/template-verify.yml b/.github/workflows/template-verify.yml index 56544f5..163f2c0 100644 --- a/.github/workflows/template-verify.yml +++ b/.github/workflows/template-verify.yml @@ -21,7 +21,7 @@ jobs: changelog: ${{ steps.properties.outputs.changelog }} steps: - # Check out current repository + # Check out the current repository - name: Fetch Sources uses: actions/checkout@v4 diff --git a/CHANGELOG.md b/CHANGELOG.md index e012b19..28d5046 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,9 +12,25 @@ - Dependencies - upgrade `org.jetbrains.intellij.platform` to `2.0.0-beta6` +## [1.14.2] - 2024-07-12 + ### Changed +- Upgrade Gradle Wrapper to `8.9` + +### Removed + +- Remove default plugin icon (`pluginIcon.svg`) + +## [1.14.1] - 2024-06-19 + +### Changed + +- Update `platformVersion` to `2023.2.7` - Upgrade Gradle Wrapper to `8.8` +- Dependencies - upgrade `org.jetbrains.intellij` to `1.17.4` +- Dependencies - downgrade `org.jetbrains.kotlin.jvm` to `1.9.24` +- Dependencies - upgrade `org.jetbrains.kotlinx.kover` to `0.8.1` ## [1.14.0] - 2024-05-30 @@ -726,7 +742,9 @@ - GitHub Actions to automate testing and deployment - Kotlin support -[Unreleased]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.14.0...HEAD +[Unreleased]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.14.2...HEAD +[1.14.2]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.14.1...v1.14.2 +[1.14.1]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.14.0...v1.14.1 [1.14.0]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.13.0...v1.14.0 [1.13.0]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.12.0...v1.13.0 [1.12.0]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.11.3...v1.12.0 diff --git a/README.md b/README.md index f9ce3f6..cabdb95 100644 --- a/README.md +++ b/README.md @@ -503,7 +503,11 @@ To find out how to generate signing certificates, check the [Plugin Signing][doc ### Publishing the plugin -Releasing a plugin to JetBrains Marketplace is a straightforward operation that uses the `publishPlugin` Gradle task provided by the [gradle-intellij-plugin][gh:gradle-intellij-plugin-docs]. +> **Tip** +> +> Make sure to follow all guidelines listed in [Publishing a Plugin][docs:publishing] to follow all recommended and required steps. + +Releasing a plugin to [JetBrains Marketplace](https://plugins.jetbrains.com) is a straightforward operation that uses the `publishPlugin` Gradle task provided by the [gradle-intellij-plugin][gh:gradle-intellij-plugin-docs]. In addition, the [Release](.github/workflows/release.yml) workflow automates this process by running the task when a new release appears in the GitHub Releases section. > **Note** diff --git a/gradle.properties b/gradle.properties index 10df82b..41dd726 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ 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.14.0 +pluginVersion = 1.14.2 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html pluginSinceBuild = 232 @@ -12,7 +12,7 @@ pluginUntilBuild = 242.* # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension platformType = IC -platformVersion = 2023.2.6 +platformVersion = 2023.2.7 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html # Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP @@ -21,7 +21,7 @@ platformPlugins = platformBundledPlugins = # Gradle Releases -> https://github.com/gradle/gradle/releases -gradleVersion = 8.8 +gradleVersion = 8.9 # 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 f1c5185..7468503 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,9 +4,9 @@ exampleLibrary = "24.1.0" # plugins changelog = "2.2.0" -intelliJPlatform = "2.0.0-beta7" -kotlin = "2.0.0" -kover = "0.8.0" +intelliJPlatform = "2.0.0-beta9" +kotlin = "1.9.24" +kover = "0.8.1" qodana = "2024.1.5" [libraries] diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e644113..2c35211 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 a441313..09523c0 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.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index b740cf1..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 25da30d..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/settings.gradle.kts b/settings.gradle.kts index 2562e41..e633135 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,4 +1,3 @@ - plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" } diff --git a/src/main/resources/META-INF/pluginIcon.svg b/src/main/resources/META-INF/pluginIcon.svg deleted file mode 100644 index af611a5..0000000 --- a/src/main/resources/META-INF/pluginIcon.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - -