diff --git a/.github/template-cleanup/README.md b/.github/template-cleanup/README.md index 3ae44a6..0a61abb 100644 --- a/.github/template-cleanup/README.md +++ b/.github/template-cleanup/README.md @@ -28,10 +28,10 @@ To keep everything working, do not remove `` sections. ## Installation - Using the IDE built-in plugin system: - + Settings/Preferences > Plugins > Marketplace > Search for "%NAME%" > Install - + - Using JetBrains Marketplace: Go to [JetBrains Marketplace](https://plugins.jetbrains.com/plugin/MARKETPLACE_ID) and install it by clicking the Install to ... button in case your IDE is running. diff --git a/.github/template-cleanup/gradle.properties b/.github/template-cleanup/gradle.properties index d24813f..80fbd57 100644 --- a/.github/template-cleanup/gradle.properties +++ b/.github/template-cleanup/gradle.properties @@ -7,11 +7,11 @@ 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 = 243 +pluginSinceBuild = 251 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension platformType = IC -platformVersion = 2024.3.6 +platformVersion = 2025.1.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 @@ -22,7 +22,7 @@ platformBundledPlugins = platformBundledModules = # Gradle Releases -> https://github.com/gradle/gradle/releases -gradleVersion = 9.0.0 +gradleVersion = 9.2.1 # 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 1548480..ba7132a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ on: concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true - + jobs: # Prepare the environment and build the plugin @@ -41,18 +41,18 @@ jobs: # Check out the current repository - name: Fetch Sources - uses: actions/checkout@v4 + uses: actions/checkout@v5 # Set up the Java environment for the next steps - name: Setup Java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: zulu java-version: 21 # Setup Gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 + uses: gradle/actions/setup-gradle@v5 # Build plugin - name: Build plugin @@ -71,7 +71,7 @@ jobs: # Store an already-built plugin as an artifact for downloading - name: Upload artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: ${{ steps.artifact.outputs.filename }} path: ./build/distributions/content/*/* @@ -92,18 +92,18 @@ jobs: # Check out the current repository - name: Fetch Sources - uses: actions/checkout@v4 + uses: actions/checkout@v5 # Set up the Java environment for the next steps - name: Setup Java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: zulu java-version: 21 # Setup Gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 + uses: gradle/actions/setup-gradle@v5 with: cache-read-only: true @@ -114,7 +114,7 @@ jobs: # Collect Tests Result of failed tests - name: Collect Tests Result if: ${{ failure() }} - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: tests-result path: ${{ github.workspace }}/build/reports/tests @@ -146,14 +146,14 @@ jobs: # Check out the current repository - name: Fetch Sources - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: - ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit - fetch-depth: 0 # a full history is required for pull request analysis + ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit + fetch-depth: 0 # a full history is required for pull request analysis # Set up the Java environment for the next steps - name: Setup Java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: zulu java-version: 21 @@ -180,18 +180,18 @@ jobs: # Check out the current repository - name: Fetch Sources - uses: actions/checkout@v4 + uses: actions/checkout@v5 # Set up the Java environment for the next steps - name: Setup Java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: zulu java-version: 21 # Setup Gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 + uses: gradle/actions/setup-gradle@v5 with: cache-read-only: true @@ -202,7 +202,7 @@ jobs: # Collect Plugin Verifier Result - name: Collect Plugin Verifier Result if: ${{ always() }} - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: pluginVerifier-result path: ${{ github.workspace }}/build/reports/pluginVerifier @@ -220,7 +220,7 @@ jobs: # Check out the current repository - name: Fetch Sources - uses: actions/checkout@v4 + uses: actions/checkout@v5 # Remove old release drafts by using the curl request for the available releases with a draft flag - name: Remove Old Release Drafts @@ -239,7 +239,7 @@ jobs: VERSION=$(./gradlew properties --property version --quiet --console=plain | tail -n 1 | cut -f2- -d ' ') RELEASE_NOTE="./build/tmp/release_note.txt" ./gradlew getChangelog --unreleased --no-header --quiet --console=plain --output-file=$RELEASE_NOTE - + gh release create $VERSION \ --draft \ --title $VERSION \ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3ac25b8..49fb01c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,20 +27,20 @@ jobs: # Check out the current repository - name: Fetch Sources - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: ref: ${{ github.event.release.tag_name }} # Set up the Java environment for the next steps - name: Setup Java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: zulu java-version: 21 # Setup Gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 + uses: gradle/actions/setup-gradle@v5 with: cache-read-only: true @@ -87,7 +87,7 @@ jobs: git checkout -b $BRANCH git commit -am "Changelog update - $VERSION" git push --set-upstream origin $BRANCH - + gh label create "$LABEL" \ --description "Pull requests with release changelog update" \ --force \ diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml index 4eb7400..dca12a7 100644 --- a/.github/workflows/run-ui-tests.yml +++ b/.github/workflows/run-ui-tests.yml @@ -33,18 +33,18 @@ jobs: # Check out the current repository - name: Fetch Sources - uses: actions/checkout@v4 + uses: actions/checkout@v5 # Set up the Java environment for the next steps - name: Setup Java - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: zulu java-version: 21 # Setup Gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 + uses: gradle/actions/setup-gradle@v5 with: cache-read-only: true diff --git a/.github/workflows/template-cleanup.yml b/.github/workflows/template-cleanup.yml index a68ad02..a8a04c3 100644 --- a/.github/workflows/template-cleanup.yml +++ b/.github/workflows/template-cleanup.yml @@ -19,7 +19,7 @@ jobs: # Check out the current repository - name: Fetch Sources - uses: actions/checkout@v4 + uses: actions/checkout@v5 # Cleanup project - name: Cleanup diff --git a/.github/workflows/template-verify.yml b/.github/workflows/template-verify.yml index 163f2c0..4c80fd7 100644 --- a/.github/workflows/template-verify.yml +++ b/.github/workflows/template-verify.yml @@ -23,13 +23,13 @@ jobs: # Check out the current repository - name: Fetch Sources - uses: actions/checkout@v4 + uses: actions/checkout@v5 # Compare `gradle.properties` with `.github/template-cleanup/gradle.properties` - name: Verify gradle.properties run: | echo "\`\`\`diff" >> $GITHUB_STEP_SUMMARY - + diff -U 0 \ -I '^pluginVersion' \ -I '^pluginGroup' \ @@ -39,5 +39,5 @@ jobs: --label gradle.properties \ .github/template-cleanup/gradle.properties gradle.properties \ >> $GITHUB_STEP_SUMMARY - + echo "\`\`\`" >> $GITHUB_STEP_SUMMARY diff --git a/CHANGELOG.md b/CHANGELOG.md index 8531b5b..cd183c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,26 @@ ## [Unreleased] +### Fixed + +- Use the GitHub event release body for a condition when creating the Release Draft + +### Changed + +- Upgrade Gradle Wrapper to `9.2.1` +- Update `platformVersion` to `2025.1.7` +- Change since build to `251` (2025.1) +- Dependencies - upgrade `org.jetbrains.intellij.platform` to `2.10.4` +- Dependencies - upgrade `org.jetbrains.kotlinx.kover` to `0.9.3` +- Dependencies - upgrade `org.jetbrains.qodana` to `2025.2.1` +- Dependencies (GitHub Actions) - upgrade `actions/checkout` to `v5` +- Dependencies (GitHub Actions) - upgrade `actions/setup-java` to `v5` +- Dependencies (GitHub Actions) - upgrade `actions/upload-artifact` to `v5` +- Dependencies (GitHub Actions) - upgrade `gradle/actions/setup-gradle` to `v5` +- Dependencies (GitHub Actions) - upgrade `JetBrains/qodana-action` to `v2025.2.2` + +## [2.3.1] - 2025-08-09 + ### Added - Add `platformBundledModules` to `gradle.properties` along with `bundledModules()` helper to the Gradle build file @@ -848,7 +868,8 @@ - GitHub Actions to automate testing and deployment - Kotlin support -[Unreleased]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v2.3.0...HEAD +[Unreleased]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v2.3.1...HEAD +[2.3.1]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v2.3.0...v2.3.1 [2.3.0]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v2.2.0...v2.3.0 [2.2.0]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v2.1.0...v2.2.0 [2.1.0]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v2.0.2...v2.1.0 diff --git a/README.md b/README.md index eb240af..11d42aa 100644 --- a/README.md +++ b/README.md @@ -195,11 +195,11 @@ It provides general information about the plugin, its dependencies, extensions, org.jetbrains.plugins.template Template JetBrains - + com.intellij.modules.platform messages.MyBundle - + diff --git a/build.gradle.kts b/build.gradle.kts index 6cbe4b2..cff4002 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -29,7 +29,7 @@ repositories { } } -// Dependencies are managed with Gradle version catalog - read more: https://docs.gradle.org/current/userguide/platforms.html#sub:version-catalog +// Dependencies are managed with Gradle version catalog - read more: https://docs.gradle.org/current/userguide/version_catalogs.html dependencies { testImplementation(libs.junit) testImplementation(libs.opentest4j) @@ -98,7 +98,7 @@ intellijPlatform { token = providers.environmentVariable("PUBLISH_TOKEN") // The pluginVersion is based on the SemVer (https://semver.org) and supports pre-release labels, like 2.1.7-alpha.3 // Specify pre-release label to publish the plugin in a custom Release Channel automatically. Read more: - // https://plugins.jetbrains.com/docs/intellij/deployment.html#specifying-a-release-channel + // https://plugins.jetbrains.com/docs/intellij/publishing-plugin.html#specifying-a-release-channel channels = providers.gradleProperty("pluginVersion").map { listOf(it.substringAfter('-', "").substringBefore('.').ifEmpty { "default" }) } } @@ -115,7 +115,7 @@ changelog { repositoryUrl = providers.gradleProperty("pluginRepositoryUrl") } -// Configure Gradle Kover Plugin - read more: https://github.com/Kotlin/kotlinx-kover#configuration +// Configure Gradle Kover Plugin - read more: https://kotlin.github.io/kotlinx-kover/gradle-plugin/#configuration-details kover { reports { total { diff --git a/gradle.properties b/gradle.properties index 943c82a..ad638bd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,14 +4,14 @@ 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 = 2.3.1 +pluginVersion = 2.4.0 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html pluginSinceBuild = 251 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension platformType = IC -platformVersion = 2025.1.5 +platformVersion = 2025.1.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 @@ -22,7 +22,7 @@ platformBundledPlugins = platformBundledModules = # Gradle Releases -> https://github.com/gradle/gradle/releases -gradleVersion = 9.0.0 +gradleVersion = 9.2.1 # 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 f8bfcfc..5ea599e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,10 +5,10 @@ opentest4j = "1.3.0" # plugins changelog = "2.4.0" -intelliJPlatform = "2.9.0" -kotlin = "2.1.20" -kover = "0.9.1" -qodana = "2025.1.1" +intelliJPlatform = "2.10.4" +kotlin = "2.2.0" +kover = "0.9.3" +qodana = "2025.2.1" [libraries] junit = { group = "junit", name = "junit", version.ref = "junit" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 8bdaf60..f8e1ee3 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 2a84e18..23449a2 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-9.0.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index ef07e01..adff685 100755 --- a/gradlew +++ b/gradlew @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" diff --git a/gradlew.bat b/gradlew.bat index db3a6ac..c4bdd3a 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,10 @@ goto fail :execute @rem Setup the command line -set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell