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 01/10] 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 02/10] 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 fc1085cbd31e8d5df37ef9beca1053e973a0c2ca Mon Sep 17 00:00:00 2001 From: Friedrich von Never Date: Fri, 8 Mar 2024 18:43:22 +0700 Subject: [PATCH 03/10] 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 04/10] 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 05/10] 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 06/10] 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 07/10] 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 08/10] 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 09/10] 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 10/10] 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