From 81769e9c5baa0a8ef5729c131178a08f4727bd10 Mon Sep 17 00:00:00 2001 From: John Mai Date: Fri, 19 Jan 2024 18:05:42 +0800 Subject: [PATCH 001/126] :arrow_up: upgrade libraries --- gradle.properties | 2 +- gradle/libs.versions.toml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 84c22a5..67754e8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ pluginGroup = com.github.maiqingqiang.goormhelper pluginName = Go ORM Helper pluginRepositoryUrl = https://github.com/maiqingqiang/go-orm-helper # SemVer format -> https://semver.org -pluginVersion = 1.2.8 +pluginVersion = 1.2.9 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html pluginSinceBuild = 222 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 52fc133..8a91536 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,15 +3,15 @@ annotations = "24.1.0" lombok = "1.18.30" guava = "33.0.0-jre" -druid = "1.2.20" +druid = "1.2.21" jsqlparser = "4.8" evoInflector = "1.3" # plugins -kotlin = "1.9.21" +kotlin = "1.9.22" changelog = "2.2.0" -gradleIntelliJPlugin = "1.16.1" +gradleIntelliJPlugin = "1.17.0" qodana = "0.1.13" kover = "0.7.5" From 79e96a1ffc91168e855bbbbe082f9498346190ef Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Fri, 1 Dec 2023 13:26:46 +0000 Subject: [PATCH 002/126] Changelog update - v1.11.3 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fde9b62..5312727 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ ## [Unreleased] +## [1.11.3] - 2023-12-01 + ### Changed - Upgrade Gradle Wrapper to `8.5` @@ -646,7 +648,8 @@ - GitHub Actions to automate testing and deployment - Kotlin support -[Unreleased]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.11.2...HEAD +[Unreleased]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.11.3...HEAD +[1.11.3]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.11.2...v1.11.3 [1.11.2]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.11.1...v1.11.2 [1.11.1]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.11.0...v1.11.1 [1.11.0]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.10.0...v1.11.0 From 521bc6519a66401fe9094fd7ac35795ab351f997 Mon Sep 17 00:00:00 2001 From: kotlinisland Date: Wed, 13 Dec 2023 14:34:37 +1000 Subject: [PATCH 003/126] Remove Gradle Kotlin DSL Lazy Property Assignment because it's default now --- .github/template-cleanup/gradle.properties | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/template-cleanup/gradle.properties b/.github/template-cleanup/gradle.properties index 1395677..d2e9f17 100644 --- a/.github/template-cleanup/gradle.properties +++ b/.github/template-cleanup/gradle.properties @@ -29,6 +29,3 @@ org.gradle.configuration-cache = true # Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html org.gradle.caching = true - -# Enable Gradle Kotlin DSL Lazy Property Assignment -> https://docs.gradle.org/current/userguide/kotlin_dsl.html#kotdsl:assignment -systemProp.org.gradle.unsafe.kotlin.assignment = true From 8d42508c6cb3d252cd104ba7f94c03b5aadaf1dc Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Fri, 1 Dec 2023 13:26:46 +0000 Subject: [PATCH 004/126] Changelog update - v1.11.3 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fde9b62..5312727 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ ## [Unreleased] +## [1.11.3] - 2023-12-01 + ### Changed - Upgrade Gradle Wrapper to `8.5` @@ -646,7 +648,8 @@ - GitHub Actions to automate testing and deployment - Kotlin support -[Unreleased]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.11.2...HEAD +[Unreleased]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.11.3...HEAD +[1.11.3]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.11.2...v1.11.3 [1.11.2]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.11.1...v1.11.2 [1.11.1]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.11.0...v1.11.1 [1.11.0]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.10.0...v1.11.0 From 0186f695085ae49c8d01b66076e905fdfd59b0c4 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Thu, 1 Feb 2024 09:48:10 +0100 Subject: [PATCH 005/126] Remove Gradle Kotlin DSL Lazy Property Assignment from the main `gradle.properties` file --- gradle.properties | 3 --- 1 file changed, 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6d9bbd4..c54e780 100644 --- a/gradle.properties +++ b/gradle.properties @@ -29,6 +29,3 @@ org.gradle.configuration-cache = true # Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html org.gradle.caching = true - -# Enable Gradle Kotlin DSL Lazy Property Assignment -> https://docs.gradle.org/current/userguide/kotlin_dsl.html#kotdsl:assignment -systemProp.org.gradle.unsafe.kotlin.assignment = true From fc3f3f4c9ff9c49b76792fa06e60389aea357606 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Thu, 1 Feb 2024 09:51:15 +0100 Subject: [PATCH 006/126] CHANGELOG update --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5312727..41cbf7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ ## [Unreleased] +### Removed + +- Remove Gradle Kotlin DSL Lazy Property Assignment because it's default now + ## [1.11.3] - 2023-12-01 ### Changed From b3cb370194b0ecb73ddec043d4ba453418807997 Mon Sep 17 00:00:00 2001 From: Ryan Rushton Date: Thu, 1 Feb 2024 20:27:58 +1100 Subject: [PATCH 007/126] Fix create draft release (#427) * Fix bash variable access in Create Release Draft step. * Fix channels assignment in publishPlugin task. * Remove Gradle Kotlin DSL Lazy Property Assignment because it's default now * Changelog update - v1.11.3 * Remove Gradle Kotlin DSL Lazy Property Assignment from the main `gradle.properties` file * CHANGELOG update * Adjust obtaining the value for `publishPlugin.channels` property. * CHANGELOG update --------- Co-authored-by: kotlinisland Co-authored-by: GitHub Action Co-authored-by: Jakub Chrzanowski --- .github/workflows/build.yml | 2 +- CHANGELOG.md | 5 +++++ build.gradle.kts | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6e21b5a..57a4862 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -256,7 +256,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - gh release create v${{ needs.build.outputs.version }} \ + gh release create "v${{ needs.build.outputs.version }}" \ --draft \ --title "v${{ needs.build.outputs.version }}" \ --notes "$(cat << 'EOM' diff --git a/CHANGELOG.md b/CHANGELOG.md index 41cbf7e..ee2b30c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ ## [Unreleased] +### Fixed + +- Adjusted obtaining the value for `publishPlugin.channels` property in `build.gradle.kts` +- Fixed bash variable access in the Create Release Draft step. + ### Removed - Remove Gradle Kotlin DSL Lazy Property Assignment because it's default now diff --git a/build.gradle.kts b/build.gradle.kts index bf0c939..7b867e7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -126,6 +126,6 @@ tasks { // 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 - channels = properties("pluginVersion").map { listOf(it.split('-').getOrElse(1) { "default" }.split('.').first()) } + channels = properties("pluginVersion").map { listOf(it.substringAfter('-').substringBefore('.').ifEmpty { "default" }) } } } From 0471a9979944cb6548353d550e2c85c9f9369d25 Mon Sep 17 00:00:00 2001 From: Alex Chmyr Date: Fri, 2 Feb 2024 22:36:47 +0000 Subject: [PATCH 008/126] Update build.yml Reducing number of concurrent builds --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6e21b5a..1b7ae42 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,6 +20,10 @@ on: # Trigger the workflow on any pull request pull_request: +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: # Prepare environment and build the plugin From b217fdd570a3376586dbfb57a4755ad10ffbe9f5 Mon Sep 17 00:00:00 2001 From: John Mai Date: Wed, 7 Feb 2024 16:29:35 +0800 Subject: [PATCH 009/126] :arrow_up: upgrade libraries --- 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 8a91536..196b5b1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,7 @@ evoInflector = "1.3" # plugins kotlin = "1.9.22" changelog = "2.2.0" -gradleIntelliJPlugin = "1.17.0" +gradleIntelliJPlugin = "1.17.1" qodana = "0.1.13" kover = "0.7.5" From b2ee179c334c479697286a18e5e13010fb299476 Mon Sep 17 00:00:00 2001 From: John Mai Date: Wed, 7 Feb 2024 16:31:22 +0800 Subject: [PATCH 010/126] :necktie: listening file refresh --- .../goormhelper/services/GoORMHelperCacheManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/github/maiqingqiang/goormhelper/services/GoORMHelperCacheManager.java b/src/main/java/com/github/maiqingqiang/goormhelper/services/GoORMHelperCacheManager.java index 6cea860..a3b3862 100644 --- a/src/main/java/com/github/maiqingqiang/goormhelper/services/GoORMHelperCacheManager.java +++ b/src/main/java/com/github/maiqingqiang/goormhelper/services/GoORMHelperCacheManager.java @@ -115,7 +115,7 @@ public void scanProject(@NotNull VirtualFile root, List excluded) { if (!fileOrDir.isDirectory()) { ScannedPath scanned = state.scannedPathMapping.get(fileOrDir.getUrl()); if (scanned == null || scanned.getLastModified() != fileOrDir.getTimeStamp()) { - parseGoFile(fileOrDir); + fileOrDir.refresh(true, true, () -> parseGoFile(fileOrDir)); } } return true; From 91c3282139413dba388cbc52c6557dfcc1c5d657 Mon Sep 17 00:00:00 2001 From: kotlinisland Date: Wed, 13 Dec 2023 14:34:37 +1000 Subject: [PATCH 011/126] Remove Gradle Kotlin DSL Lazy Property Assignment because it's default now --- .github/template-cleanup/gradle.properties | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/template-cleanup/gradle.properties b/.github/template-cleanup/gradle.properties index 1395677..d2e9f17 100644 --- a/.github/template-cleanup/gradle.properties +++ b/.github/template-cleanup/gradle.properties @@ -29,6 +29,3 @@ org.gradle.configuration-cache = true # Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html org.gradle.caching = true - -# Enable Gradle Kotlin DSL Lazy Property Assignment -> https://docs.gradle.org/current/userguide/kotlin_dsl.html#kotdsl:assignment -systemProp.org.gradle.unsafe.kotlin.assignment = true From 3d18989b531792f210f587e95873342ad96e3718 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Thu, 1 Feb 2024 09:48:10 +0100 Subject: [PATCH 012/126] Remove Gradle Kotlin DSL Lazy Property Assignment from the main `gradle.properties` file --- gradle.properties | 3 --- 1 file changed, 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6d9bbd4..c54e780 100644 --- a/gradle.properties +++ b/gradle.properties @@ -29,6 +29,3 @@ org.gradle.configuration-cache = true # Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html org.gradle.caching = true - -# Enable Gradle Kotlin DSL Lazy Property Assignment -> https://docs.gradle.org/current/userguide/kotlin_dsl.html#kotdsl:assignment -systemProp.org.gradle.unsafe.kotlin.assignment = true From 9f4051c3d8c68ea7f256b4580e6d0fd421f05133 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Thu, 1 Feb 2024 09:51:15 +0100 Subject: [PATCH 013/126] CHANGELOG update --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5312727..41cbf7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ ## [Unreleased] +### Removed + +- Remove Gradle Kotlin DSL Lazy Property Assignment because it's default now + ## [1.11.3] - 2023-12-01 ### Changed From de86d6b34b56e0c66f07fc52ecdc5a092c5d7aca Mon Sep 17 00:00:00 2001 From: Ryan Rushton Date: Thu, 1 Feb 2024 20:27:58 +1100 Subject: [PATCH 014/126] Fix create draft release (#427) * Fix bash variable access in Create Release Draft step. * Fix channels assignment in publishPlugin task. * Remove Gradle Kotlin DSL Lazy Property Assignment because it's default now * Changelog update - v1.11.3 * Remove Gradle Kotlin DSL Lazy Property Assignment from the main `gradle.properties` file * CHANGELOG update * Adjust obtaining the value for `publishPlugin.channels` property. * CHANGELOG update --------- Co-authored-by: kotlinisland Co-authored-by: GitHub Action Co-authored-by: Jakub Chrzanowski --- .github/workflows/build.yml | 2 +- CHANGELOG.md | 5 +++++ build.gradle.kts | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1b7ae42..93eebd8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -260,7 +260,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - gh release create v${{ needs.build.outputs.version }} \ + gh release create "v${{ needs.build.outputs.version }}" \ --draft \ --title "v${{ needs.build.outputs.version }}" \ --notes "$(cat << 'EOM' diff --git a/CHANGELOG.md b/CHANGELOG.md index 41cbf7e..ee2b30c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ ## [Unreleased] +### Fixed + +- Adjusted obtaining the value for `publishPlugin.channels` property in `build.gradle.kts` +- Fixed bash variable access in the Create Release Draft step. + ### Removed - Remove Gradle Kotlin DSL Lazy Property Assignment because it's default now diff --git a/build.gradle.kts b/build.gradle.kts index bf0c939..7b867e7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -126,6 +126,6 @@ tasks { // 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 - channels = properties("pluginVersion").map { listOf(it.split('-').getOrElse(1) { "default" }.split('.').first()) } + channels = properties("pluginVersion").map { listOf(it.substringAfter('-').substringBefore('.').ifEmpty { "default" }) } } } From 367a43582ff5dae46559cf8a7e1cf82a6b17ca6a Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Tue, 20 Feb 2024 20:05:28 +0100 Subject: [PATCH 015/126] CHANGELOG update --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee2b30c..18db6fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ ## [Unreleased] +### Added + +- GitHub Actions: Reduce the number of concurrent builds + ### Fixed - Adjusted obtaining the value for `publishPlugin.channels` property in `build.gradle.kts` From 76d15e31e8a91cd8814f4ba8ce13f4dcb55504a6 Mon Sep 17 00:00:00 2001 From: sadv1r <5000487+sadv1r@users.noreply.github.com> Date: Sat, 3 Feb 2024 01:45:15 +0300 Subject: [PATCH 016/126] GitHub Actions: Replace gradle/gradle-build-action@v2 with gradle/actions/setup-gradle@v3 --- .github/workflows/build.yml | 6 +++--- .github/workflows/release.yml | 2 +- .github/workflows/run-ui-tests.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 93eebd8..1649e6e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,7 +53,7 @@ jobs: # Setup Gradle - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/actions/setup-gradle@v3 with: gradle-home-cache-cleanup: true @@ -117,7 +117,7 @@ jobs: # Setup Gradle - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/actions/setup-gradle@v3 with: gradle-home-cache-cleanup: true @@ -201,7 +201,7 @@ jobs: # Setup Gradle - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/actions/setup-gradle@v3 with: gradle-home-cache-cleanup: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0d48e56..a67c249 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,7 +33,7 @@ jobs: # Setup Gradle - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/actions/setup-gradle@v3 with: gradle-home-cache-cleanup: true diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml index 05e483b..23d609d 100644 --- a/.github/workflows/run-ui-tests.yml +++ b/.github/workflows/run-ui-tests.yml @@ -44,7 +44,7 @@ jobs: # Setup Gradle - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/actions/setup-gradle@v3 with: gradle-home-cache-cleanup: true From d3258cea7fbdf18b0eeea7dcf4189a9148345e5c Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Tue, 20 Feb 2024 20:09:59 +0100 Subject: [PATCH 017/126] CHANGELOG update --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18db6fe..0cffef0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ - GitHub Actions: Reduce the number of concurrent builds +### Changed + +- Dependencies (GitHub Actions) - upgrade `gradle/gradle-build-action@v2` to `gradle/actions/setup-gradle@v3` + ### Fixed - Adjusted obtaining the value for `publishPlugin.channels` property in `build.gradle.kts` From a51bde09cf5f47d885302b35aa2557c607571a45 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Tue, 20 Feb 2024 20:13:38 +0100 Subject: [PATCH 018/126] Dependencies (GitHub Actions) - upgrade `JetBrains/qodana-action` to `v2023.3.1` --- .github/workflows/build.yml | 2 +- CHANGELOG.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1649e6e..9221a58 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -170,7 +170,7 @@ jobs: # Run Qodana inspections - name: Qodana - Code Inspection - uses: JetBrains/qodana-action@v2023.2.8 + uses: JetBrains/qodana-action@v2023.3.1 with: cache-default-branch-only: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 0cffef0..58db2a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ ### Changed - Dependencies (GitHub Actions) - upgrade `gradle/gradle-build-action@v2` to `gradle/actions/setup-gradle@v3` +- Dependencies (GitHub Actions) - upgrade `JetBrains/qodana-action` to `v2023.3.1` ### Fixed From b9b2639dca70d33ce5d047bfc75944744946b623 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Tue, 20 Feb 2024 22:07:47 +0100 Subject: [PATCH 019/126] Dependencies - upgrade `org.jetbrains.intellij` to `1.17.2` --- CHANGELOG.md | 1 + gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 58db2a9..63f832d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ ### Changed +- Dependencies - upgrade `org.jetbrains.intellij` to `1.17.2` - Dependencies (GitHub Actions) - upgrade `gradle/gradle-build-action@v2` to `gradle/actions/setup-gradle@v3` - Dependencies (GitHub Actions) - upgrade `JetBrains/qodana-action` to `v2023.3.1` diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index febb8cd..963bc3c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ annotations = "24.1.0" # plugins kotlin = "1.9.21" changelog = "2.2.0" -gradleIntelliJPlugin = "1.16.1" +gradleIntelliJPlugin = "1.17.2" qodana = "0.1.13" kover = "0.7.5" From 9a177f918badb5ef8b97cb363a58af8a92ce5c31 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Tue, 20 Feb 2024 22:10:11 +0100 Subject: [PATCH 020/126] Upgrade Gradle Wrapper to `8.6` --- .github/template-cleanup/gradle.properties | 2 +- CHANGELOG.md | 1 + gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew.bat | 20 ++++++++++---------- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/template-cleanup/gradle.properties b/.github/template-cleanup/gradle.properties index d2e9f17..fda5079 100644 --- a/.github/template-cleanup/gradle.properties +++ b/.github/template-cleanup/gradle.properties @@ -19,7 +19,7 @@ platformVersion = 2022.3.3 platformPlugins = # Gradle Releases -> https://github.com/gradle/gradle/releases -gradleVersion = 8.5 +gradleVersion = 8.6 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib kotlin.stdlib.default.dependency = false diff --git a/CHANGELOG.md b/CHANGELOG.md index 63f832d..ad159ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ ### Changed +- Upgrade Gradle Wrapper to `8.6` - Dependencies - upgrade `org.jetbrains.intellij` to `1.17.2` - Dependencies (GitHub Actions) - upgrade `gradle/gradle-build-action@v2` to `gradle/actions/setup-gradle@v3` - Dependencies (GitHub Actions) - upgrade `JetBrains/qodana-action` to `v2023.3.1` diff --git a/gradle.properties b/gradle.properties index c54e780..631e5bf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,7 +19,7 @@ platformVersion = 2022.3.3 platformPlugins = # Gradle Releases -> https://github.com/gradle/gradle/releases -gradleVersion = 8.5 +gradleVersion = 8.6 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib kotlin.stdlib.default.dependency = false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1af9e09..a80b22c 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.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 93e3f59..25da30d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail From 7c0690cbec68a823a401dbbc03f139588e300655 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Tue, 20 Feb 2024 22:11:23 +0100 Subject: [PATCH 021/126] Change since/until build to `223-241.*` (2022.3-2024.1.*) --- .github/template-cleanup/gradle.properties | 2 +- CHANGELOG.md | 1 + gradle.properties | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/template-cleanup/gradle.properties b/.github/template-cleanup/gradle.properties index fda5079..d3f3954 100644 --- a/.github/template-cleanup/gradle.properties +++ b/.github/template-cleanup/gradle.properties @@ -8,7 +8,7 @@ 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 = 233.* +pluginUntilBuild = 241.* # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension platformType = IC diff --git a/CHANGELOG.md b/CHANGELOG.md index ad159ac..a9a2bee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ ### Changed +- Change since/until build to `223-241.*` (2022.3-2024.1.*) - Upgrade Gradle Wrapper to `8.6` - Dependencies - upgrade `org.jetbrains.intellij` to `1.17.2` - Dependencies (GitHub Actions) - upgrade `gradle/gradle-build-action@v2` to `gradle/actions/setup-gradle@v3` diff --git a/gradle.properties b/gradle.properties index 631e5bf..29404ab 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ pluginVersion = 1.11.3 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html pluginSinceBuild = 223 -pluginUntilBuild = 233.* +pluginUntilBuild = 241.* # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension platformType = IC From 9cb309ff88beabd569b47bff5a19112703e2e02f Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Tue, 20 Feb 2024 22:14:21 +0100 Subject: [PATCH 022/126] 1.12.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 29404ab..fc81754 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.11.3 +pluginVersion = 1.12.0 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html pluginSinceBuild = 223 From c25c79d3edcccbbcd33eb72e1096d794091207ee Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 20 Feb 2024 21:40:28 +0000 Subject: [PATCH 023/126] Changelog update - v1.12.0 --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9a2bee..273c325 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ ## [Unreleased] +## [1.12.0] - 2024-02-20 + ### Added - GitHub Actions: Reduce the number of concurrent builds @@ -669,7 +671,8 @@ - GitHub Actions to automate testing and deployment - Kotlin support -[Unreleased]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.11.3...HEAD +[Unreleased]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.12.0...HEAD +[1.12.0]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.11.3...v1.12.0 [1.11.3]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.11.2...v1.11.3 [1.11.2]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.11.1...v1.11.2 [1.11.1]: https://github.com/JetBrains/intellij-platform-plugin-template/compare/v1.11.0...v1.11.1 From 5a275e45d7b25e45588c453b1a1965ad12f89f95 Mon Sep 17 00:00:00 2001 From: KotlinIsland <65446343+kotlinisland@users.noreply.github.com> Date: Thu, 22 Feb 2024 12:25:25 +1000 Subject: [PATCH 024/126] Bump org.gradle.toolchains.foojay-resolver-convention MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps org.gradle.toolchains.foojay-resolver-convention from 0.7.0 to 0.8.0. --- updated-dependencies: - dependency-name: org.gradle.toolchains.foojay-resolver-convention   dependency-type: direct:production   update-type: version-update:semver-minor --- .github/template-cleanup/settings.gradle.kts | 2 +- CHANGELOG.md | 4 ++++ settings.gradle.kts | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/template-cleanup/settings.gradle.kts b/.github/template-cleanup/settings.gradle.kts index a223046..06653a4 100644 --- a/.github/template-cleanup/settings.gradle.kts +++ b/.github/template-cleanup/settings.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0" + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" } rootProject.name = "%NAME%" diff --git a/CHANGELOG.md b/CHANGELOG.md index 273c325..ce1f495 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ ## [Unreleased] +### Changed + +- Gradle - upgrade `org.gradle.toolchains.foojay-resolver-convention` to `0.8.0` + ## [1.12.0] - 2024-02-20 ### Added diff --git a/settings.gradle.kts b/settings.gradle.kts index 897361b..e633135 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0" + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" } rootProject.name = "IntelliJ Platform Plugin Template" From b5aaa3ff5ed5aac3ea47c0e32e2bee1466990258 Mon Sep 17 00:00:00 2001 From: Friedrich von Never Date: Fri, 8 Mar 2024 18:39:20 +0700 Subject: [PATCH 025/126] Release workflow: remove Java (#443) * Release workflow: remove Java It is not required in this workflow anyway. * CHANGELOG.md update --------- Co-authored-by: Jakub Chrzanowski --- .github/workflows/build.yml | 7 ------- CHANGELOG.md | 4 ++++ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9221a58..09371e5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -239,13 +239,6 @@ jobs: - name: Fetch Sources uses: actions/checkout@v4 - # Set up Java environment for the next steps - - name: Setup Java - uses: actions/setup-java@v4 - with: - distribution: zulu - java-version: 17 - # Remove old release drafts by using the curl request for the available releases with a draft flag - name: Remove Old Release Drafts env: diff --git a/CHANGELOG.md b/CHANGELOG.md index ce1f495..e63b3ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ - Gradle - upgrade `org.gradle.toolchains.foojay-resolver-convention` to `0.8.0` +### Removed + +- GitHub Actions: Remove the `Setup Java` step from the `releaseDraft` build step + ## [1.12.0] - 2024-02-20 ### Added From 2f824e058455dc59b3e45815a97bd28350dbdbcc Mon Sep 17 00:00:00 2001 From: Friedrich von Never Date: Fri, 8 Mar 2024 18:43:22 +0700 Subject: [PATCH 026/126] Plugin publication: fix the channel selector (#444) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Plugin publication: fix the channel selector Before this patch, publisher was always using the channel corresponding to the first number in the plugin version for release builds. This is because by default, Kotlin's substringAfter will return the whole input string if it's unable to find the needle. * Bump org.gradle.toolchains.foojay-resolver-convention Bumps org.gradle.toolchains.foojay-resolver-convention from 0.7.0 to 0.8.0. --- updated-dependencies: - dependency-name: org.gradle.toolchains.foojay-resolver-convention   dependency-type: direct:production   update-type: version-update:semver-minor * Release workflow: remove Java (#443) * Release workflow: remove Java It is not required in this workflow anyway. * CHANGELOG.md update --------- Co-authored-by: Jakub Chrzanowski * CHANGELOG.md update --------- Co-authored-by: KotlinIsland <65446343+kotlinisland@users.noreply.github.com> Co-authored-by: Jakub Chrzanowski --- .github/template-cleanup/settings.gradle.kts | 2 +- .github/workflows/build.yml | 7 ------- CHANGELOG.md | 12 ++++++++++++ build.gradle.kts | 2 +- settings.gradle.kts | 2 +- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/template-cleanup/settings.gradle.kts b/.github/template-cleanup/settings.gradle.kts index a223046..06653a4 100644 --- a/.github/template-cleanup/settings.gradle.kts +++ b/.github/template-cleanup/settings.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0" + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" } rootProject.name = "%NAME%" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9221a58..09371e5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -239,13 +239,6 @@ jobs: - name: Fetch Sources uses: actions/checkout@v4 - # Set up Java environment for the next steps - - name: Setup Java - uses: actions/setup-java@v4 - with: - distribution: zulu - java-version: 17 - # Remove old release drafts by using the curl request for the available releases with a draft flag - name: Remove Old Release Drafts env: diff --git a/CHANGELOG.md b/CHANGELOG.md index 273c325..9cb89f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,18 @@ ## [Unreleased] +### Changed + +- Gradle - upgrade `org.gradle.toolchains.foojay-resolver-convention` to `0.8.0` + +### Fixed + +- Fixed calculation of the plugin publication channel + +### Removed + +- GitHub Actions: Remove the `Setup Java` step from the `releaseDraft` build step + ## [1.12.0] - 2024-02-20 ### Added diff --git a/build.gradle.kts b/build.gradle.kts index 7b867e7..c5e5958 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -126,6 +126,6 @@ tasks { // 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 - channels = properties("pluginVersion").map { listOf(it.substringAfter('-').substringBefore('.').ifEmpty { "default" }) } + channels = properties("pluginVersion").map { listOf(it.substringAfter('-', "").substringBefore('.').ifEmpty { "default" }) } } } diff --git a/settings.gradle.kts b/settings.gradle.kts index 897361b..e633135 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0" + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" } rootProject.name = "IntelliJ Platform Plugin Template" From fc1085cbd31e8d5df37ef9beca1053e973a0c2ca Mon Sep 17 00:00:00 2001 From: Friedrich von Never Date: Fri, 8 Mar 2024 18:43:22 +0700 Subject: [PATCH 027/126] Plugin publication: fix the channel selector (#444) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Plugin publication: fix the channel selector Before this patch, publisher was always using the channel corresponding to the first number in the plugin version for release builds. This is because by default, Kotlin's substringAfter will return the whole input string if it's unable to find the needle. * Bump org.gradle.toolchains.foojay-resolver-convention Bumps org.gradle.toolchains.foojay-resolver-convention from 0.7.0 to 0.8.0. --- updated-dependencies: - dependency-name: org.gradle.toolchains.foojay-resolver-convention   dependency-type: direct:production   update-type: version-update:semver-minor * Release workflow: remove Java (#443) * Release workflow: remove Java It is not required in this workflow anyway. * CHANGELOG.md update --------- Co-authored-by: Jakub Chrzanowski * CHANGELOG.md update --------- Co-authored-by: KotlinIsland <65446343+kotlinisland@users.noreply.github.com> Co-authored-by: Jakub Chrzanowski --- CHANGELOG.md | 4 ++++ build.gradle.kts | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e63b3ee..9cb89f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ - Gradle - upgrade `org.gradle.toolchains.foojay-resolver-convention` to `0.8.0` +### Fixed + +- Fixed calculation of the plugin publication channel + ### Removed - GitHub Actions: Remove the `Setup Java` step from the `releaseDraft` build step diff --git a/build.gradle.kts b/build.gradle.kts index 7b867e7..c5e5958 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -126,6 +126,6 @@ tasks { // 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 - channels = properties("pluginVersion").map { listOf(it.substringAfter('-').substringBefore('.').ifEmpty { "default" }) } + channels = properties("pluginVersion").map { listOf(it.substringAfter('-', "").substringBefore('.').ifEmpty { "default" }) } } } From ac57f20bb3d2362323cef96844a0631858f1c1da Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 8 Mar 2024 12:48:11 +0100 Subject: [PATCH 028/126] Make the `Run Tests` run configuration use the `RunAsTest` IDE feature #446 --- .run/Run Tests.run.xml | 1 + CHANGELOG.md | 1 + 2 files changed, 2 insertions(+) diff --git a/.run/Run Tests.run.xml b/.run/Run Tests.run.xml index 132d9ad..f281bdc 100644 --- a/.run/Run Tests.run.xml +++ b/.run/Run Tests.run.xml @@ -19,6 +19,7 @@ true true false + true diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cb89f5..11b8182 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ ### Fixed - Fixed calculation of the plugin publication channel +- Make the `Run Tests` run configuration use the `RunAsTest` IDE feature ### Removed From 8ddc338d232c5e5b1c32a68ea478fceadf0a6108 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 8 Mar 2024 12:53:11 +0100 Subject: [PATCH 029/126] Gradle - cleanup the `jvmToolchain` setup --- CHANGELOG.md | 1 + build.gradle.kts | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11b8182..a02d7ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ ### Changed - Gradle - upgrade `org.gradle.toolchains.foojay-resolver-convention` to `0.8.0` +- Gradle - cleanup the `jvmToolchain` setup ### Fixed diff --git a/build.gradle.kts b/build.gradle.kts index c5e5958..c745262 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -26,13 +26,9 @@ dependencies { // implementation(libs.annotations) } -// Set the JVM language level used to build the project. Use Java 11 for 2020.3+, and Java 17 for 2022.2+. +// Set the JVM language level used to build the project. kotlin { - @Suppress("UnstableApiUsage") - jvmToolchain { - languageVersion = JavaLanguageVersion.of(17) - vendor = JvmVendorSpec.JETBRAINS - } + jvmToolchain(17) } // Configure Gradle IntelliJ Plugin - read more: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html From 2504c560d8b44ee5640fcf8f9e85f61e6eced4aa Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 8 Mar 2024 12:55:57 +0100 Subject: [PATCH 030/126] Dependencies - upgrade `org.jetbrains.kotlin.jvm` to `1.9.23` --- CHANGELOG.md | 1 + gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a02d7ec..d869ac3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ ### Changed +- Dependencies - upgrade `org.jetbrains.kotlin.jvm` to `1.9.23` - Gradle - upgrade `org.gradle.toolchains.foojay-resolver-convention` to `0.8.0` - Gradle - cleanup the `jvmToolchain` setup diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 963bc3c..e82dddd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ annotations = "24.1.0" # plugins -kotlin = "1.9.21" +kotlin = "1.9.23" changelog = "2.2.0" gradleIntelliJPlugin = "1.17.2" qodana = "0.1.13" From b7f5f2afcd6f10c97408d8befbe92ed5a48c1392 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 8 Mar 2024 13:00:30 +0100 Subject: [PATCH 031/126] Dependencies - upgrade `org.jetbrains.kotlinx.kover` to `0.7.6` --- CHANGELOG.md | 1 + gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d869ac3..cbee1cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ ### Changed - Dependencies - upgrade `org.jetbrains.kotlin.jvm` to `1.9.23` +- Dependencies - upgrade `org.jetbrains.kotlinx.kover` to `0.7.6` - Gradle - upgrade `org.gradle.toolchains.foojay-resolver-convention` to `0.8.0` - Gradle - cleanup the `jvmToolchain` setup diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e82dddd..18c12d7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ kotlin = "1.9.23" changelog = "2.2.0" gradleIntelliJPlugin = "1.17.2" qodana = "0.1.13" -kover = "0.7.5" +kover = "0.7.6" [libraries] annotations = { group = "org.jetbrains", name = "annotations", version.ref = "annotations" } From e6736aee127658401de3187fa65f7dc14acbf235 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 8 Mar 2024 13:02:09 +0100 Subject: [PATCH 032/126] Dependencies - upgrade `org.jetbrains.qodana` to `2023.3.1` --- CHANGELOG.md | 1 + gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cbee1cf..0534406 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Dependencies - upgrade `org.jetbrains.kotlin.jvm` to `1.9.23` - Dependencies - upgrade `org.jetbrains.kotlinx.kover` to `0.7.6` +- Dependencies - upgrade `org.jetbrains.qodana` to `2023.3.1` - Gradle - upgrade `org.gradle.toolchains.foojay-resolver-convention` to `0.8.0` - Gradle - cleanup the `jvmToolchain` setup diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 18c12d7..20c8749 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ annotations = "24.1.0" kotlin = "1.9.23" changelog = "2.2.0" gradleIntelliJPlugin = "1.17.2" -qodana = "0.1.13" +qodana = "2023.3.1" kover = "0.7.6" [libraries] From de5d2e9901566700c79629b8c4b64f6c1384b996 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 8 Mar 2024 13:19:02 +0100 Subject: [PATCH 033/126] Replace the whole `IntelliJ Platform Plugin Template` with the new project name when running the GitHub Actions Cleanup workflow #442 --- .github/workflows/template-cleanup.yml | 2 +- CHANGELOG.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/template-cleanup.yml b/.github/workflows/template-cleanup.yml index f80003a..360f30b 100644 --- a/.github/workflows/template-cleanup.yml +++ b/.github/workflows/template-cleanup.yml @@ -41,7 +41,7 @@ jobs: # Replace template package name in project files with $GROUP find src -type f -exec sed -i "s/org.jetbrains.plugins.template/$GROUP/g" {} + - find src -type f -exec sed -i "s/IntelliJ Platform Plugin/$NAME/g" {} + + find src -type f -exec sed -i "s/IntelliJ Platform Plugin Template/$NAME/g" {} + find src -type f -exec sed -i "s/JetBrains/$ACTOR/g" {} + # Move content diff --git a/CHANGELOG.md b/CHANGELOG.md index 0534406..2a61a89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ - Fixed calculation of the plugin publication channel - Make the `Run Tests` run configuration use the `RunAsTest` IDE feature +- Replace the whole `IntelliJ Platform Plugin Template` with the new project name when running the GitHub Actions Cleanup workflow ### Removed From 164d4ead5b8cb6a18d54bc338dd168872bcc81bb Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 8 Mar 2024 13:28:46 +0100 Subject: [PATCH 034/126] 1.13.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index fc81754..e13e6c0 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.12.0 +pluginVersion = 1.13.0 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html pluginSinceBuild = 223 From db8f493cc18cc9ee56e31e124435ef00f86bc0a1 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 8 Mar 2024 13:42:46 +0100 Subject: [PATCH 035/126] Gradle - Removed Qodana Gradle Plugin configuration to rely on defaults --- CHANGELOG.md | 1 + build.gradle.kts | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a61a89..7777504 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ ### Removed - GitHub Actions: Remove the `Setup Java` step from the `releaseDraft` build step +- Gradle - Removed Qodana Gradle Plugin configuration to rely on defaults ## [1.12.0] - 2024-02-20 diff --git a/build.gradle.kts b/build.gradle.kts index c745262..7cc0417 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -47,14 +47,6 @@ changelog { repositoryUrl = properties("pluginRepositoryUrl") } -// Configure Gradle Qodana Plugin - read more: https://github.com/JetBrains/gradle-qodana-plugin -qodana { - cachePath = provider { file(".qodana").canonicalPath } - reportPath = provider { file("build/reports/inspections").canonicalPath } - saveReport = true - showReport = environment("QODANA_SHOW_REPORT").map { it.toBoolean() }.getOrElse(false) -} - // Configure Gradle Kover Plugin - read more: https://github.com/Kotlin/kotlinx-kover#configuration koverReport { defaults { From 81206eb0c2c9af1336750a13e471155b4fd2bea8 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 8 Mar 2024 13:50:22 +0100 Subject: [PATCH 036/126] Run Configurations - `Run Qodana` runs the `qodanaScan` Gradle task --- .run/Run Qodana.run.xml | 8 +------- CHANGELOG.md | 3 ++- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.run/Run Qodana.run.xml b/.run/Run Qodana.run.xml index c92f33c..6b31b81 100644 --- a/.run/Run Qodana.run.xml +++ b/.run/Run Qodana.run.xml @@ -1,11 +1,6 @@ -