From c61f22d5cd01af509a2649fd5c44e77dac73a503 Mon Sep 17 00:00:00 2001 From: KotlinIsland <65446343+KotlinIsland@users.noreply.github.com> Date: Fri, 4 Aug 2023 18:49:32 +1000 Subject: [PATCH 01/12] =?UTF-8?q?(=F0=9F=8E=81)=20Add=20Foojay=20toolchain?= =?UTF-8?q?=20provider=20plugin=20(#391)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add Foojay toolchain provider plugin --------- Co-authored-by: KotlinIsland Co-authored-by: Jakub Chrzanowski --- CHANGELOG.md | 2 ++ settings.gradle.kts | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index db9f9bc..c45a0b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ # IntelliJ Platform Plugin Template Changelog ## [Unreleased] +### Added +- [Foojay Toolchains Plugin](https://github.com/gradle/foojay-toolchains) integration ## [1.9.0] - 2023-07-11 diff --git a/settings.gradle.kts b/settings.gradle.kts index 8ada61f..a745554 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1 +1,5 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.6.0" +} + rootProject.name = "IntelliJ Platform Plugin Template" From 4f1d1e8af543f42a717380b5779dca52eef66e0a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 28 Jul 2023 06:45:25 +0000 Subject: [PATCH 02/12] Bump org.jetbrains.kotlinx.kover from 0.7.2 to 0.7.3 Bumps [org.jetbrains.kotlinx.kover](https://github.com/Kotlin/kotlinx-kover) from 0.7.2 to 0.7.3. - [Release notes](https://github.com/Kotlin/kotlinx-kover/releases) - [Changelog](https://github.com/Kotlin/kotlinx-kover/blob/main/CHANGELOG.md) - [Commits](https://github.com/Kotlin/kotlinx-kover/compare/v0.7.2...v0.7.3) --- updated-dependencies: - dependency-name: org.jetbrains.kotlinx.kover dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c974082..4e93875 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ kotlin = "1.9.0" changelog = "2.1.2" gradleIntelliJPlugin = "1.15.0" qodana = "0.1.13" -kover = "0.7.2" +kover = "0.7.3" [libraries] annotations = { group = "org.jetbrains", name = "annotations", version.ref = "annotations" } From 13b3ee1b81d7f02a567cc5e932b79a436ad1c58c Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 4 Aug 2023 10:51:42 +0200 Subject: [PATCH 03/12] CHANGELOG update --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c45a0b3..d306da8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ ### Added - [Foojay Toolchains Plugin](https://github.com/gradle/foojay-toolchains) integration +### Changed +- Dependencies - upgrade `org.jetbrains.kotlinx.kover` to `0.7.3` + ## [1.9.0] - 2023-07-11 ### Added From 8aa8ec67530dc4d73a6b0e31c9f589d955a9706f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 06:43:14 +0000 Subject: [PATCH 04/12] Bump gradle/wrapper-validation-action from 1.0.6 to 1.1.0 Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 1.0.6 to 1.1.0. - [Release notes](https://github.com/gradle/wrapper-validation-action/releases) - [Commits](https://github.com/gradle/wrapper-validation-action/compare/v1.0.6...v1.1.0) --- updated-dependencies: - dependency-name: gradle/wrapper-validation-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5e6b8b1..fb516dd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,7 +45,7 @@ jobs: # Validate wrapper - name: Gradle Wrapper Validation - uses: gradle/wrapper-validation-action@v1.0.6 + uses: gradle/wrapper-validation-action@v1.1.0 # Setup Java environment for the next steps - name: Setup Java From 3dfb24527dd0448da4fbbfd53910a486abf9b36c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Jul 2023 06:37:26 +0000 Subject: [PATCH 05/12] Bump JetBrains/qodana-action from 2023.1.5 to 2023.2.1 Bumps [JetBrains/qodana-action](https://github.com/jetbrains/qodana-action) from 2023.1.5 to 2023.2.1. - [Release notes](https://github.com/jetbrains/qodana-action/releases) - [Commits](https://github.com/jetbrains/qodana-action/compare/v2023.1.5...v2023.2.1) --- updated-dependencies: - dependency-name: JetBrains/qodana-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fb516dd..447bbbc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -162,7 +162,7 @@ jobs: # Run Qodana inspections - name: Qodana - Code Inspection - uses: JetBrains/qodana-action@v2023.1.5 + uses: JetBrains/qodana-action@v2023.2.1 with: cache-default-branch-only: true From 43f3a72b66ce11d27ecb6a17641c88d7db815bad Mon Sep 17 00:00:00 2001 From: Jonathan Gafner Date: Sat, 15 Jul 2023 14:09:39 +0300 Subject: [PATCH 06/12] Fix Upload Code Coverage Report step --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 447bbbc..0461caa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -136,7 +136,7 @@ jobs: - name: Upload Code Coverage Report uses: codecov/codecov-action@v3 with: - files: ${{ github.workspace }}/build/reports/kover/xml/report.xml + files: ${{ github.workspace }}/build/reports/kover/report.xml # Run Qodana inspections and provide report inspectCode: From 2a71e4b59597927d15bc373e07a27ced9f872ab5 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 4 Aug 2023 10:56:22 +0200 Subject: [PATCH 07/12] CHANGELOG update --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d306da8..2164882 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,11 @@ ### Changed - Dependencies - upgrade `org.jetbrains.kotlinx.kover` to `0.7.3` +- Dependencies (GitHub Actions) - upgrade `gradle/wrapper-validation-action` to `v1.1.0` +- Dependencies (GitHub Actions) - upgrade `JetBrains/qodana-action` to `v2023.2.1` + +### Fixed +- GitHub Actions: Fixed Kover report path when uploading the code coverage report ## [1.9.0] - 2023-07-11 From 9be85b8e626d6d8a89e3e8736318eb9b6cd58f10 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 4 Aug 2023 11:58:42 +0200 Subject: [PATCH 08/12] GitHub Actions: set `gradle-home-cache-cleanup: true` flag to the Gradle Build Action --- .github/workflows/build.yml | 6 ++++++ .github/workflows/release.yml | 2 ++ .github/workflows/run-ui-tests.yml | 2 ++ CHANGELOG.md | 3 ++- 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0461caa..d84b9dd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -57,6 +57,8 @@ jobs: # Setup Gradle - name: Setup Gradle uses: gradle/gradle-build-action@v2 + with: + gradle-home-cache-cleanup: true # Set environment variables - name: Export Properties @@ -119,6 +121,8 @@ jobs: # Setup Gradle - name: Setup Gradle uses: gradle/gradle-build-action@v2 + with: + gradle-home-cache-cleanup: true # Run tests - name: Run Tests @@ -187,6 +191,8 @@ jobs: # Setup Gradle - name: Setup Gradle uses: gradle/gradle-build-action@v2 + with: + gradle-home-cache-cleanup: true # Cache Plugin Verifier IDEs - name: Setup Plugin Verifier IDEs Cache diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7e6ca56..cc3d403 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,6 +34,8 @@ jobs: # Setup Gradle - name: Setup Gradle uses: gradle/gradle-build-action@v2 + with: + gradle-home-cache-cleanup: true # Set environment variables - name: Export Properties diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml index 3ddd498..65682e7 100644 --- a/.github/workflows/run-ui-tests.yml +++ b/.github/workflows/run-ui-tests.yml @@ -45,6 +45,8 @@ jobs: # Setup Gradle - name: Setup Gradle uses: gradle/gradle-build-action@v2 + with: + gradle-home-cache-cleanup: true # Run IDEA prepared for UI testing - name: Run IDE diff --git a/CHANGELOG.md b/CHANGELOG.md index 2164882..6c5e4ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,8 @@ ## [Unreleased] ### Added -- [Foojay Toolchains Plugin](https://github.com/gradle/foojay-toolchains) integration +- [Foojay Toolchains Plugin](https://github.com/gradle/foojay-toolchains) integration +- GitHub Actions: set `gradle-home-cache-cleanup: true` flag to the Gradle Build Action ### Changed - Dependencies - upgrade `org.jetbrains.kotlinx.kover` to `0.7.3` From 9f26d955a6241e524775a9be3e6b7f74142244cc Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 4 Aug 2023 12:31:24 +0200 Subject: [PATCH 09/12] GitHub Actions: rearrange the Build workflow --- .github/workflows/build.yml | 4 ++-- CHANGELOG.md | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d84b9dd..f13f434 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -173,7 +173,7 @@ jobs: # Run plugin structure verification along with IntelliJ Plugin Verifier verify: name: Verify plugin - needs: [ build, test, inspectCode ] + needs: [ build ] runs-on: ubuntu-latest steps: @@ -218,7 +218,7 @@ jobs: releaseDraft: name: Release draft if: github.event_name != 'pull_request' - needs: [ build, verify ] + needs: [ build, test, inspectCode, verify ] runs-on: ubuntu-latest permissions: contents: write diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c5e4ee..912d0de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - GitHub Actions: set `gradle-home-cache-cleanup: true` flag to the Gradle Build Action ### Changed +- GitHub Actions: rearrange the Build workflow - Dependencies - upgrade `org.jetbrains.kotlinx.kover` to `0.7.3` - Dependencies (GitHub Actions) - upgrade `gradle/wrapper-validation-action` to `v1.1.0` - Dependencies (GitHub Actions) - upgrade `JetBrains/qodana-action` to `v2023.2.1` From 3803765c9b46204a90ccb36b782ec91452596cd1 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 4 Aug 2023 12:36:08 +0200 Subject: [PATCH 10/12] GitHub Actions: use `jlumbroso/free-disk-space` to free disk space --- .github/workflows/build.yml | 8 ++++---- CHANGELOG.md | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f13f434..b185ba9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,10 +34,10 @@ jobs: # Free GitHub Actions Environment Disk Space - name: Maximize Build Space - run: | - sudo rm -rf /usr/share/dotnet - sudo rm -rf /usr/local/lib/android - sudo rm -rf /opt/ghc + uses: jlumbroso/free-disk-space@main + with: + tool-cache: false + large-packages: false # Check out current repository - name: Fetch Sources diff --git a/CHANGELOG.md b/CHANGELOG.md index 912d0de..e550c43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ ### Added - [Foojay Toolchains Plugin](https://github.com/gradle/foojay-toolchains) integration - GitHub Actions: set `gradle-home-cache-cleanup: true` flag to the Gradle Build Action +- GitHub Actions: use `jlumbroso/free-disk-space` to free disk space ### Changed - GitHub Actions: rearrange the Build workflow From 3805431e93ddbf9a8dc41951d438260aa20859cb Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 4 Aug 2023 14:35:01 +0200 Subject: [PATCH 11/12] GitHub Issue Templates --- .github/ISSUE_TEMPLATE/bug_report.md | 23 -------- .github/ISSUE_TEMPLATE/bug_report.yml | 63 ++++++++++++++++++++++ .github/ISSUE_TEMPLATE/config.yml | 8 +++ .github/ISSUE_TEMPLATE/feature_request.yml | 32 +++++++++++ 4 files changed, 103 insertions(+), 23 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml create mode 100644 .github/ISSUE_TEMPLATE/config.yml create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yml diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 9821b18..0000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,23 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: '' -assignees: '' ---- - - - -**Describe the bug:** - - -**Steps to reproduce:** - - -**Expected behavior:** - - -**Additional context:** - diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml new file mode 100644 index 0000000..bd9f9fb --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -0,0 +1,63 @@ +name: Bug report +description: Create a report to help us improve +labels: ["bug"] +body: + + - type: textarea + id: issue + attributes: + label: What happened? + description: A clear and concise description of what the bug is. + validations: + required: true + + - type: textarea + id: logs + attributes: + label: Relevant log output or stack trace + description: | + Please copy and paste any relevant log output. + Add the full stack trace if available. + If possible, run the failing task with `--stacktrace` flag. + + *This will be automatically formatted into code, so there is no need for backticks.* + render: shell + + - type: textarea + id: steps + attributes: + label: Steps to reproduce + description: Steps to reproduce the behavior – provide your build configuration. + validations: + required: true + + - type: input + id: version + attributes: + label: Gradle IntelliJ Plugin version + placeholder: 1.16.0 + validations: + required: true + + - type: input + id: gradle + attributes: + label: Gradle version + placeholder: 8.2.1 + validations: + required: true + + - type: dropdown + id: os + attributes: + label: Operating System + options: + - macOS + - Linux + - Windows + + - type: input + id: url + attributes: + label: Link to build, i.e. failing GitHub Action job + placeholder: https://github.com/username/project/actions/runs/1234567890 diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 0000000..58278e9 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,8 @@ +blank_issues_enabled: true +contact_links: + - name: Documentation + url: https://github.com/JetBrains/intellij-platform-plugin-template + about: Check the README file in the first place. + - name: Getting Help + url: https://plugins.jetbrains.com/docs/intellij/getting-help.html + about: Check if you search for a help in plugin development. diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml new file mode 100644 index 0000000..9c13061 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -0,0 +1,32 @@ +name: Feature request +description: Suggest an idea for this project +labels: ["enhancement"] +body: + + - type: textarea + id: cause + attributes: + label: Describe the need of your request + description: A clear and concise description of what the need or problem is. + validations: + required: true + + - type: textarea + id: solution + attributes: + label: Proposed solution + description: A clear and concise description of what you want to happen. + validations: + required: true + + - type: textarea + id: alternatives + attributes: + label: Alternatives you've considered + description: What did you try so far to accomplish the goal? + + - type: textarea + id: context + attributes: + label: Additional context + description: Add any other context or screenshots about the feature request here. From 39c3d0ec1416a413fe2ee04904ebf23859f7ac07 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 4 Aug 2023 15:34:29 +0200 Subject: [PATCH 12/12] 1.10.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 454366b..62d931d 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.9.0 +pluginVersion = 1.10.0 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html pluginSinceBuild = 222