From a23f859ba76d833117de1f9fed07b9ab98db1222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9bron?= Date: Wed, 5 Jun 2024 17:17:50 +0200 Subject: [PATCH 01/37] Gradle 8.8 --- CHANGELOG.md | 2 ++ gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d91a38c6..0df569bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ ## [Unreleased] +- Upgrade Gradle Wrapper to `8.8` + ## [1.14.0] - 2024-05-30 ### Changed diff --git a/gradle.properties b/gradle.properties index 484a423f..6a12d4ad 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,7 +19,7 @@ platformVersion = 2023.2.6 platformPlugins = # Gradle Releases -> https://github.com/gradle/gradle/releases -gradleVersion = 8.7 +gradleVersion = 8.8 # 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 b82aa23a..a4413138 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.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a42..b740cf13 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. From 2fd14cda2e282f64922fbfe757ab22ebafe8eca4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9bron?= Date: Wed, 5 Jun 2024 17:22:36 +0200 Subject: [PATCH 02/37] Gradle 8.8, fix template cleanup --- .github/template-cleanup/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/template-cleanup/gradle.properties b/.github/template-cleanup/gradle.properties index be51561d..1e7bc6eb 100644 --- a/.github/template-cleanup/gradle.properties +++ b/.github/template-cleanup/gradle.properties @@ -19,7 +19,7 @@ platformVersion = 2023.2.6 platformPlugins = # Gradle Releases -> https://github.com/gradle/gradle/releases -gradleVersion = 8.7 +gradleVersion = 8.8 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib kotlin.stdlib.default.dependency = false From a746a36063bca1b7c10a5a72d4ba73c14629b8b0 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Tue, 20 Feb 2024 22:49:22 +0100 Subject: [PATCH 03/37] Migrate to IntelliJ Platform Gradle Plugin 2.0 EAP --- build.gradle.kts | 114 ++++++++++++++++++++++---------------- gradle.properties | 4 +- gradle/libs.versions.toml | 4 +- settings.gradle.kts | 8 +++ 4 files changed, 78 insertions(+), 52 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 962daa41..5131df29 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ fun environment(key: String) = providers.environmentVariable(key) plugins { id("java") // Java support alias(libs.plugins.kotlin) // Kotlin support - alias(libs.plugins.gradleIntelliJPlugin) // Gradle IntelliJ Plugin + alias(libs.plugins.intelliJPlatformGradlePlugin) // IntelliJ Platform Gradle Plugin alias(libs.plugins.changelog) // Gradle Changelog Plugin alias(libs.plugins.qodana) // Gradle Qodana Plugin alias(libs.plugins.kover) // Gradle Kover Plugin @@ -19,57 +19,42 @@ version = properties("pluginVersion").get() // Configure project's dependencies repositories { mavenCentral() + + // IntelliJ Platform Gradle Plugin Repositories Extension - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-repositories-extension.html + intellijPlatform { + defaultRepositories() + } } // Dependencies are managed with Gradle version catalog - read more: https://docs.gradle.org/current/userguide/platforms.html#sub:version-catalog dependencies { -// implementation(libs.exampleLibrary) -} - -// Set the JVM language level used to build the project. -kotlin { - jvmToolchain(17) -} + // implementation(libs.exampleLibrary) -// Configure Gradle IntelliJ Plugin - read more: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html -intellij { - pluginName = properties("pluginName") - version = properties("platformVersion") - type = properties("platformType") + // IntelliJ Platform Gradle Plugin Dependencies Extension - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html + intellijPlatform { + create(properties("platformType"), properties("platformVersion")) - // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file. - plugins = properties("platformPlugins").map { it.split(',').map(String::trim).filter(String::isNotEmpty) } -} + // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins. + bundledPlugins(properties("platformBundledPlugins").map { it.split(',') }) -// Configure Gradle Changelog Plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin -changelog { - groups.empty() - repositoryUrl = properties("pluginRepositoryUrl") -} - -// Configure Gradle Kover Plugin - read more: https://github.com/Kotlin/kotlinx-kover#configuration -kover { - reports { - total { - xml { - onCheck = true - } - } + // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file for plugin from JetBrains Marketplace. + plugins(properties("platformPlugins").map { it.split(',') }) } } -tasks { - wrapper { - gradleVersion = properties("gradleVersion").get() - } +// Set the JVM language level used to build the project. +kotlin { + jvmToolchain(17) +} - patchPluginXml { +// Configure IntelliJ Platform Gradle Plugin - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-extension.html +intellijPlatform { + pluginConfiguration { + name = properties("pluginName") version = properties("pluginVersion") - sinceBuild = properties("pluginSinceBuild") - untilBuild = properties("pluginUntilBuild") // Extract the section from README.md and provide for the plugin's manifest - pluginDescription = providers.fileContents(layout.projectDirectory.file("README.md")).asText.map { + description = providers.fileContents(layout.projectDirectory.file("README.md")).asText.map { val start = "" val end = "" @@ -93,25 +78,20 @@ tasks { ) } } - } - // Configure UI tests plugin - // Read more: https://github.com/JetBrains/intellij-ui-test-robot - runIdeForUiTests { - systemProperty("robot-server.port", "8082") - systemProperty("ide.mac.message.dialogs.as.sheets", "false") - systemProperty("jb.privacy.policy.text", "") - systemProperty("jb.consents.confirmation.enabled", "false") + ideaVersion { + sinceBuild = properties("pluginSinceBuild") + untilBuild = properties("pluginUntilBuild") + } } - signPlugin { + signing { certificateChain = environment("CERTIFICATE_CHAIN") privateKey = environment("PRIVATE_KEY") password = environment("PRIVATE_KEY_PASSWORD") } - publishPlugin { - dependsOn("patchChangelog") + publishing { token = environment("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: @@ -119,3 +99,39 @@ tasks { channels = properties("pluginVersion").map { listOf(it.substringAfter('-', "").substringBefore('.').ifEmpty { "default" }) } } } + +// Configure Gradle Changelog Plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin +changelog { + groups.empty() + repositoryUrl = properties("pluginRepositoryUrl") +} + +// Configure Gradle Kover Plugin - read more: https://github.com/Kotlin/kotlinx-kover#configuration +kover { + reports { + total { + xml { + onCheck = true + } + } + } +} + +tasks { + wrapper { + gradleVersion = properties("gradleVersion").get() + } + + // Configure UI tests plugin + // Read more: https://github.com/JetBrains/intellij-ui-test-robot + testIdeUi { + systemProperty("robot-server.port", "8082") + systemProperty("ide.mac.message.dialogs.as.sheets", "false") + systemProperty("jb.privacy.policy.text", "") + systemProperty("jb.consents.confirmation.enabled", "false") + } + + publishPlugin { + dependsOn(patchChangelog) + } +} diff --git a/gradle.properties b/gradle.properties index 6a12d4ad..10df82b1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,8 +15,10 @@ platformType = IC platformVersion = 2023.2.6 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html -# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22 +# Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP platformPlugins = +# Example: platformBundledPlugins = com.intellij.java +platformBundledPlugins = # Gradle Releases -> https://github.com/gradle/gradle/releases gradleVersion = 8.8 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0155a477..41597f93 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ exampleLibrary = "24.1.0" # plugins kotlin = "2.0.0" changelog = "2.2.0" -gradleIntelliJPlugin = "1.17.3" +intelliJPlatformGradlePlugin = "2.0.0-SNAPSHOT" qodana = "2024.1.5" kover = "0.8.0" @@ -14,7 +14,7 @@ exampleLibrary = { group = "com.example", name = "exampleLibrary", version.ref = [plugins] changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" } -gradleIntelliJPlugin = { id = "org.jetbrains.intellij", version.ref = "gradleIntelliJPlugin" } +intelliJPlatformGradlePlugin = { id = "org.jetbrains.intellij.platform", version.ref = "intelliJPlatformGradlePlugin" } kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" } qodana = { id = "org.jetbrains.qodana", version.ref = "qodana" } diff --git a/settings.gradle.kts b/settings.gradle.kts index e633135e..67db84ae 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,11 @@ +// Use IntelliJ Platform Gradle Plugin snapshot repository +pluginManagement { + repositories { + maven("https://oss.sonatype.org/content/repositories/snapshots/") + gradlePluginPortal() + } +} + plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" } From be87c6b2b262b78999e4c491a1e90ad94e6fdfa7 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Tue, 20 Feb 2024 23:02:36 +0100 Subject: [PATCH 04/37] Rename Gradle version catalog key for IntelliJ Platform Gradle Plugin to `intelliJPlatform` --- build.gradle.kts | 2 +- gradle/libs.versions.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 5131df29..e26dbb3d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ fun environment(key: String) = providers.environmentVariable(key) plugins { id("java") // Java support alias(libs.plugins.kotlin) // Kotlin support - alias(libs.plugins.intelliJPlatformGradlePlugin) // IntelliJ Platform Gradle Plugin + alias(libs.plugins.intelliJPlatform) // IntelliJ Platform Gradle Plugin alias(libs.plugins.changelog) // Gradle Changelog Plugin alias(libs.plugins.qodana) // Gradle Qodana Plugin alias(libs.plugins.kover) // Gradle Kover Plugin diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 41597f93..50985b82 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ exampleLibrary = "24.1.0" # plugins kotlin = "2.0.0" changelog = "2.2.0" -intelliJPlatformGradlePlugin = "2.0.0-SNAPSHOT" +intelliJPlatform = "2.0.0-SNAPSHOT" qodana = "2024.1.5" kover = "0.8.0" @@ -14,7 +14,7 @@ exampleLibrary = { group = "com.example", name = "exampleLibrary", version.ref = [plugins] changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" } -intelliJPlatformGradlePlugin = { id = "org.jetbrains.intellij.platform", version.ref = "intelliJPlatformGradlePlugin" } +intelliJPlatform = { id = "org.jetbrains.intellij.platform", version.ref = "intelliJPlatform" } kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" } qodana = { id = "org.jetbrains.qodana", version.ref = "qodana" } From c7799095f69e4cf8182900a08488f723a0958e7c Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Tue, 27 Feb 2024 13:53:36 +0100 Subject: [PATCH 05/37] Add `instrumentationTools()` to the dependencies --- build.gradle.kts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index e26dbb3d..b8caf757 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,6 +16,11 @@ plugins { group = properties("pluginGroup").get() version = properties("pluginVersion").get() +// Set the JVM language level used to build the project. +kotlin { + jvmToolchain(17) +} + // Configure project's dependencies repositories { mavenCentral() @@ -39,18 +44,14 @@ dependencies { // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file for plugin from JetBrains Marketplace. plugins(properties("platformPlugins").map { it.split(',') }) - } -} -// Set the JVM language level used to build the project. -kotlin { - jvmToolchain(17) + instrumentationTools() + } } // Configure IntelliJ Platform Gradle Plugin - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-extension.html intellijPlatform { pluginConfiguration { - name = properties("pluginName") version = properties("pluginVersion") // Extract the section from README.md and provide for the plugin's manifest From aca1a500bc1815846edfe1d3dda3cdaa6cec26ed Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Tue, 5 Mar 2024 22:52:03 +0100 Subject: [PATCH 06/37] testFramework --- .gitignore | 1 + build.gradle.kts | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index e2e5d94e..ffabde68 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .gradle .idea +.intellijPlatform .qodana build diff --git a/build.gradle.kts b/build.gradle.kts index b8caf757..bac93335 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,6 @@ import org.jetbrains.changelog.Changelog import org.jetbrains.changelog.markdownToHTML +import org.jetbrains.intellij.platform.gradle.extensions.TestFrameworkType fun properties(key: String) = providers.gradleProperty(key) fun environment(key: String) = providers.environmentVariable(key) @@ -46,6 +47,7 @@ dependencies { plugins(properties("platformPlugins").map { it.split(',') }) instrumentationTools() + testFramework(TestFrameworkType.Platform.JUnit4) } } From da699e9dbfa8d25bbb49a80510ae782b12b0d8d2 Mon Sep 17 00:00:00 2001 From: Friedrich von Never Date: Fri, 8 Mar 2024 18:39:20 +0700 Subject: [PATCH 07/37] 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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0df569bb..298810c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,6 +49,10 @@ - GitHub Actions: Remove the `Setup Java` step from the `releaseDraft` build step - Gradle - Removed Qodana Gradle Plugin configuration to rely on defaults +### Removed + +- GitHub Actions: Remove the `Setup Java` step from the `releaseDraft` build step + ## [1.12.0] - 2024-02-20 ### Added From bbaabfe294f2b07b8196e3cafcd14fa0ada1965a Mon Sep 17 00:00:00 2001 From: Friedrich von Never Date: Fri, 8 Mar 2024 18:43:22 +0700 Subject: [PATCH 08/37] 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 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 298810c1..6712925e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,6 +49,10 @@ - GitHub Actions: Remove the `Setup Java` step from the `releaseDraft` build step - Gradle - Removed Qodana Gradle Plugin configuration to rely on defaults +### Fixed + +- Fixed calculation of the plugin publication channel + ### Removed - GitHub Actions: Remove the `Setup Java` step from the `releaseDraft` build step From a53b879b23e94452f972b748bc6b2993935f7f98 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 8 Mar 2024 12:48:11 +0100 Subject: [PATCH 09/37] Make the `Run Tests` run configuration use the `RunAsTest` IDE feature #446 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6712925e..93d5b573 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,6 +52,7 @@ ### Fixed - Fixed calculation of the plugin publication channel +- Make the `Run Tests` run configuration use the `RunAsTest` IDE feature ### Removed From 38a12bf91244aa8f27668719ae0a986ec046a65c Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 8 Mar 2024 12:53:11 +0100 Subject: [PATCH 10/37] Gradle - cleanup the `jvmToolchain` setup --- CHANGELOG.md | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93d5b573..3b5377ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,17 +40,6 @@ ### Fixed -- Fixed calculation of the plugin publication channel -- Run Configurations - `Run Tests` uses the `RunAsTest` IDE feature -- Replace the whole `IntelliJ Platform Plugin Template` with the new project name when running the GitHub Actions Cleanup workflow - -### Removed - -- GitHub Actions: Remove the `Setup Java` step from the `releaseDraft` build step -- Gradle - Removed Qodana Gradle Plugin configuration to rely on defaults - -### Fixed - - Fixed calculation of the plugin publication channel - Make the `Run Tests` run configuration use the `RunAsTest` IDE feature From 240e06cc533b1e5e6fe74928c0aac81abbcca9e3 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 8 Mar 2024 13:19:02 +0100 Subject: [PATCH 11/37] Replace the whole `IntelliJ Platform Plugin Template` with the new project name when running the GitHub Actions Cleanup workflow #442 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b5377ef..f5332d0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,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 7202bfac40245f7d7ea0c6d51c3e42d5f3f9552e Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 8 Mar 2024 13:42:46 +0100 Subject: [PATCH 12/37] Gradle - Removed Qodana Gradle Plugin configuration to rely on defaults --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f5332d0f..f36e5cd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,6 +47,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 From 87a8cd993017f57c0590a66acd8a015f13e15055 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 8 Mar 2024 13:50:22 +0100 Subject: [PATCH 13/37] Run Configurations - `Run Qodana` runs the `qodanaScan` Gradle task --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f36e5cd5..0df569bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,7 +41,7 @@ ### Fixed - Fixed calculation of the plugin publication channel -- Make the `Run Tests` run configuration use the `RunAsTest` IDE feature +- Run Configurations - `Run Tests` uses 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 22f70af6980905cbce80d473f3fc88f76c5941ac Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Mon, 11 Mar 2024 10:38:24 +0100 Subject: [PATCH 14/37] GitHub Template Cleanup: gradle.properties --- .github/template-cleanup/gradle.properties | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/template-cleanup/gradle.properties b/.github/template-cleanup/gradle.properties index 1e7bc6eb..456d9e8c 100644 --- a/.github/template-cleanup/gradle.properties +++ b/.github/template-cleanup/gradle.properties @@ -15,8 +15,10 @@ platformType = IC platformVersion = 2023.2.6 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html -# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22 +# Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP platformPlugins = +# Example: platformBundledPlugins = com.intellij.java +platformBundledPlugins = # Gradle Releases -> https://github.com/gradle/gradle/releases gradleVersion = 8.8 From f83b2a7dd4e857ff78e8b98c8119152f55fdead7 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 15 Mar 2024 20:58:36 +0100 Subject: [PATCH 15/37] Add Plugin Verifier configuration --- build.gradle.kts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index bac93335..bacd0c72 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -47,6 +47,7 @@ dependencies { plugins(properties("platformPlugins").map { it.split(',') }) instrumentationTools() + pluginVerifier() testFramework(TestFrameworkType.Platform.JUnit4) } } @@ -101,6 +102,12 @@ intellijPlatform { // https://plugins.jetbrains.com/docs/intellij/deployment.html#specifying-a-release-channel channels = properties("pluginVersion").map { listOf(it.substringAfter('-', "").substringBefore('.').ifEmpty { "default" }) } } + + verifyPlugin { + ides { + recommended() + } + } } // Configure Gradle Changelog Plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin From 8c641e4966ecdec14d2ef5d2716179f74d3ce09e Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Mon, 15 Apr 2024 09:40:00 +0200 Subject: [PATCH 16/37] Dependencies - upgrade `org.jetbrains.qodana` to `2023.3.2` --- CHANGELOG.md | 2 +- gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0df569bb..4c5c3d74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,7 +29,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` +- Dependencies - upgrade `org.jetbrains.qodana` to `2023.3.2` - Dependencies (GitHub Actions) - upgrade `actions/upload-artifact` to `4` - Dependencies (GitHub Actions) - upgrade `codecov/codecov-action` to `4` - Dependencies (GitHub Actions) - upgrade `gradle/wrapper-validation-action` to `2` diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 50985b82..a0f9d79d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,8 +6,8 @@ exampleLibrary = "24.1.0" kotlin = "2.0.0" changelog = "2.2.0" intelliJPlatform = "2.0.0-SNAPSHOT" -qodana = "2024.1.5" kover = "0.8.0" +qodana = "2024.1.5" [libraries] exampleLibrary = { group = "com.example", name = "exampleLibrary", version.ref = "exampleLibrary" } From 767bea0f5a4d6cea17a1b1a0785df451a9b01568 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Mon, 15 Apr 2024 09:47:21 +0200 Subject: [PATCH 17/37] Use IntelliJ Platform Gradle Plugin `2.0.0-beta1` --- CHANGELOG.md | 6 ++++++ gradle/libs.versions.toml | 4 ++-- settings.gradle.kts | 7 ------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c5c3d74..07fc5492 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ ## [Unreleased] +### Added + +- Use IntelliJ Platform Gradle Plugin `2.0.0-beta1` + +### Changed + - Upgrade Gradle Wrapper to `8.8` ## [1.14.0] - 2024-05-30 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a0f9d79d..169601c8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,9 +3,9 @@ exampleLibrary = "24.1.0" # plugins -kotlin = "2.0.0" changelog = "2.2.0" -intelliJPlatform = "2.0.0-SNAPSHOT" +intelliJPlatform = "2.0.0-beta1" +kotlin = "2.0.0" kover = "0.8.0" qodana = "2024.1.5" diff --git a/settings.gradle.kts b/settings.gradle.kts index 67db84ae..2562e418 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,10 +1,3 @@ -// Use IntelliJ Platform Gradle Plugin snapshot repository -pluginManagement { - repositories { - maven("https://oss.sonatype.org/content/repositories/snapshots/") - gradlePluginPortal() - } -} plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" From 51cac269b188958ffa2b72eeeee90394b731962c Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Tue, 16 Apr 2024 23:54:27 +0200 Subject: [PATCH 18/37] Update `TestFrameworkType` import --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index bacd0c72..49aa47ac 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,6 @@ import org.jetbrains.changelog.Changelog import org.jetbrains.changelog.markdownToHTML -import org.jetbrains.intellij.platform.gradle.extensions.TestFrameworkType +import org.jetbrains.intellij.platform.gradle.TestFrameworkType fun properties(key: String) = providers.gradleProperty(key) fun environment(key: String) = providers.environmentVariable(key) From b4ff5e14a9b5a0d55c780e13146f4b5e655ce4ca Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Tue, 16 Apr 2024 23:55:31 +0200 Subject: [PATCH 19/37] Use IntelliJ Platform Gradle Plugin 2.0 in GitHub Actions --- .github/workflows/build.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 38283686..030c8040 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,7 @@ jobs: pluginVerifierHomeDir: ${{ steps.properties.outputs.pluginVerifierHomeDir }} steps: - # Check out current repository + # Check out the current repository - name: Fetch Sources uses: actions/checkout@v4 @@ -73,8 +73,6 @@ jobs: echo "$CHANGELOG" >> $GITHUB_OUTPUT echo "EOF" >> $GITHUB_OUTPUT - ./gradlew listProductsReleases # prepare list of IDEs for Plugin Verifier - # Build plugin - name: Build plugin run: ./gradlew buildPlugin @@ -104,7 +102,7 @@ jobs: runs-on: ubuntu-latest steps: - # Check out current repository + # Check out the current repository - name: Fetch Sources uses: actions/checkout@v4 @@ -157,7 +155,7 @@ jobs: tool-cache: false large-packages: false - # Check out current repository + # Check out the current repository - name: Fetch Sources uses: actions/checkout@v4 @@ -188,7 +186,7 @@ jobs: tool-cache: false large-packages: false - # Check out current repository + # Check out the current repository - name: Fetch Sources uses: actions/checkout@v4 @@ -214,7 +212,7 @@ jobs: # Run Verify Plugin task and IntelliJ Plugin Verifier tool - name: Run Plugin Verification tasks - run: ./gradlew runPluginVerifier -Dplugin.verifier.home.dir=${{ needs.build.outputs.pluginVerifierHomeDir }} + run: ./gradlew verifyPlugin -Dplugin.verifier.home.dir=${{ needs.build.outputs.pluginVerifierHomeDir }} # Collect Plugin Verifier Result - name: Collect Plugin Verifier Result @@ -235,7 +233,7 @@ jobs: contents: write steps: - # Check out current repository + # Check out the current repository - name: Fetch Sources uses: actions/checkout@v4 From 0999d97fe537bc4fcd110b3d7338919d90f0fe1e Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Thu, 30 May 2024 16:40:30 +0200 Subject: [PATCH 20/37] Use IntelliJ Platform Gradle Plugin `2.0.0-beta5` --- CHANGELOG.md | 6 +++++- gradle/libs.versions.toml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 07fc5492..90309f81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,11 @@ ### Added -- Use IntelliJ Platform Gradle Plugin `2.0.0-beta1` +- Use IntelliJ Platform Gradle Plugin `2.0` + +### Changed + +- Dependencies - upgrade `org.jetbrains.intellij.platform` to `2.0.0-beta5` ### Changed diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 169601c8..fefa06d1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ exampleLibrary = "24.1.0" # plugins changelog = "2.2.0" -intelliJPlatform = "2.0.0-beta1" +intelliJPlatform = "2.0.0-beta5" kotlin = "2.0.0" kover = "0.8.0" qodana = "2024.1.5" From 0a59020482cef268dbe22775fb0a504705a59398 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Thu, 6 Jun 2024 12:02:49 +0200 Subject: [PATCH 21/37] Dependencies - upgrade `org.jetbrains.intellij.platform` to `2.0.0-beta6` --- CHANGELOG.md | 2 +- gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90309f81..e012b19f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ ### Changed -- Dependencies - upgrade `org.jetbrains.intellij.platform` to `2.0.0-beta5` +- Dependencies - upgrade `org.jetbrains.intellij.platform` to `2.0.0-beta6` ### Changed diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fefa06d1..90a02a88 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ exampleLibrary = "24.1.0" # plugins changelog = "2.2.0" -intelliJPlatform = "2.0.0-beta5" +intelliJPlatform = "2.0.0-beta6" kotlin = "2.0.0" kover = "0.8.0" qodana = "2024.1.5" From af9a2b4c331a2b42ac2832c5de36da6cdd3131f1 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 14 Jun 2024 16:09:38 +0200 Subject: [PATCH 22/37] GitHub Actions: update the UI Tests task name to `testIdeUi` --- .github/workflows/release.yml | 2 +- .github/workflows/run-ui-tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a67c249d..d3d4bcf8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,7 +51,7 @@ jobs: echo "$CHANGELOG" >> $GITHUB_OUTPUT echo "EOF" >> $GITHUB_OUTPUT - # Update Unreleased section with the current release note + # Update the Unreleased section with the current release note - name: Patch Changelog if: ${{ steps.properties.outputs.changelog != '' }} env: diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml index 145a2aba..d9a72b92 100644 --- a/.github/workflows/run-ui-tests.yml +++ b/.github/workflows/run-ui-tests.yml @@ -27,7 +27,7 @@ jobs: - os: windows-latest runIde: start gradlew.bat runIdeForUiTests - os: macos-latest - runIde: ./gradlew runIdeForUiTests & + runIde: ./gradlew testIdeUi & steps: From 79bea43e25b5409919d775bba0d29e79cf54cecf Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 14 Jun 2024 21:20:18 +0200 Subject: [PATCH 23/37] 2.0.0-beta7 --- build.gradle.kts | 2 +- gradle/libs.versions.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 49aa47ac..ab03dacc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -48,7 +48,7 @@ dependencies { instrumentationTools() pluginVerifier() - testFramework(TestFrameworkType.Platform.JUnit4) + testFramework(TestFrameworkType.Platform) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 90a02a88..f1c51854 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ exampleLibrary = "24.1.0" # plugins changelog = "2.2.0" -intelliJPlatform = "2.0.0-beta6" +intelliJPlatform = "2.0.0-beta7" kotlin = "2.0.0" kover = "0.8.0" qodana = "2024.1.5" From 4a6cef52aeeab76d1199012e4128b7cf9df72746 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Mon, 15 Jul 2024 09:05:14 +0200 Subject: [PATCH 24/37] Add missing `zipSigner()` dependency --- build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle.kts b/build.gradle.kts index ab03dacc..40764355 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -48,6 +48,7 @@ dependencies { instrumentationTools() pluginVerifier() + zipSigner() testFramework(TestFrameworkType.Platform) } } From 4bd83f6553cbe20f6e746dde34b1d77ce792414c Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Wed, 17 Jul 2024 15:36:01 +0200 Subject: [PATCH 25/37] Remove `org.gradle.toolchains.foojay-resolver-convention` Gradle plugin from settings --- settings.gradle.kts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index e633135e..8ada61fd 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1 @@ -plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" -} - rootProject.name = "IntelliJ Platform Plugin Template" From fefb39725a2a9cabe52877d81b9372d1b5881796 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Thu, 18 Jul 2024 16:56:12 +0200 Subject: [PATCH 26/37] Add `junit:junit:4.13.2` to test dependencies --- build.gradle.kts | 2 +- gradle/libs.versions.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 40764355..ae927de0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -34,7 +34,7 @@ repositories { // Dependencies are managed with Gradle version catalog - read more: https://docs.gradle.org/current/userguide/platforms.html#sub:version-catalog dependencies { - // implementation(libs.exampleLibrary) + testImplementation(libs.junit) // IntelliJ Platform Gradle Plugin Dependencies Extension - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html intellijPlatform { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 74685034..63564664 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] # libraries -exampleLibrary = "24.1.0" +junit = "4.13.2" # plugins changelog = "2.2.0" @@ -10,7 +10,7 @@ kover = "0.8.1" qodana = "2024.1.5" [libraries] -exampleLibrary = { group = "com.example", name = "exampleLibrary", version.ref = "exampleLibrary" } +junit = { group = "junit", name = "junit", version.ref = "junit" } [plugins] changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" } From f43cbe52ac1d0dfb4411cfe1bd29f44b5ddba786 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 19 Jul 2024 19:52:31 +0200 Subject: [PATCH 27/37] Update `org.jetbrains.intellij.platform` to `2.0.0-RC1` --- 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 63564664..cd0fa9fd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ junit = "4.13.2" # plugins changelog = "2.2.0" -intelliJPlatform = "2.0.0-beta9" +intelliJPlatform = "2.0.0-RC1" kotlin = "1.9.24" kover = "0.8.1" qodana = "2024.1.5" From 7fae82c680246568393da4965bfa5b468cef06dc Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 19 Jul 2024 20:06:16 +0200 Subject: [PATCH 28/37] Bring back `runIdeForUiTests` --- .github/workflows/run-ui-tests.yml | 2 +- build.gradle.kts | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml index a6c55eac..6b60acd7 100644 --- a/.github/workflows/run-ui-tests.yml +++ b/.github/workflows/run-ui-tests.yml @@ -27,7 +27,7 @@ jobs: - os: windows-latest runIde: start gradlew.bat runIdeForUiTests - os: macos-latest - runIde: ./gradlew testIdeUi & + runIde: ./gradlew runIdeForUiTests & steps: diff --git a/build.gradle.kts b/build.gradle.kts index ae927de0..51e9e9d1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,6 @@ import org.jetbrains.changelog.Changelog import org.jetbrains.changelog.markdownToHTML +import org.jetbrains.intellij.platform.gradle.Constants.Constraints import org.jetbrains.intellij.platform.gradle.TestFrameworkType fun properties(key: String) = providers.gradleProperty(key) @@ -146,3 +147,20 @@ tasks { dependsOn(patchChangelog) } } + +val runIdeForUiTests by intellijPlatformTesting.runIde.registering { + task { + jvmArgumentProviders += CommandLineArgumentProvider { + listOf( + "-Drobot-server.port=8082", + "-Dide.mac.message.dialogs.as.sheets=false", + "-Djb.privacy.policy.text=", + "-Djb.consents.confirmation.enabled=false", + ) + } + } + + plugins { + robotServerPlugin(Constraints.LATEST_VERSION) + } +} From f54d13865326f0d3dfff45faba43a1e9e8c0adef Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 19 Jul 2024 20:29:47 +0200 Subject: [PATCH 29/37] Bring back `runIdeForUiTests` --- build.gradle.kts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 51e9e9d1..3025733a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -134,15 +134,6 @@ tasks { gradleVersion = properties("gradleVersion").get() } - // Configure UI tests plugin - // Read more: https://github.com/JetBrains/intellij-ui-test-robot - testIdeUi { - systemProperty("robot-server.port", "8082") - systemProperty("ide.mac.message.dialogs.as.sheets", "false") - systemProperty("jb.privacy.policy.text", "") - systemProperty("jb.consents.confirmation.enabled", "false") - } - publishPlugin { dependsOn(patchChangelog) } From d4550874ba1950527dd40d2168e1a47f9569be70 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Sat, 20 Jul 2024 10:27:11 +0200 Subject: [PATCH 30/37] Update `org.jetbrains.intellij.platform` to `2.0.0-rc1` --- 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 cd0fa9fd..0ddf7387 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ junit = "4.13.2" # plugins changelog = "2.2.0" -intelliJPlatform = "2.0.0-RC1" +intelliJPlatform = "2.0.0-rc 1" kotlin = "1.9.24" kover = "0.8.1" qodana = "2024.1.5" From dc3507cc7174bd84d92824361db15c20d6f39238 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Sat, 20 Jul 2024 10:53:47 +0200 Subject: [PATCH 31/37] Update `org.jetbrains.intellij.platform` to `2.0.0-rc1` --- 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 0ddf7387..9db275a7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ junit = "4.13.2" # plugins changelog = "2.2.0" -intelliJPlatform = "2.0.0-rc 1" +intelliJPlatform = "2.0.0-rc1" kotlin = "1.9.24" kover = "0.8.1" qodana = "2024.1.5" From 8c3191eec04564d22967d8fccb54d65696582915 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Fri, 26 Jul 2024 22:46:10 +0200 Subject: [PATCH 32/37] intelliJPlatform = "2.0.0-rc2" --- 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 9db275a7..b1846212 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ junit = "4.13.2" # plugins changelog = "2.2.0" -intelliJPlatform = "2.0.0-rc1" +intelliJPlatform = "2.0.0-rc2" kotlin = "1.9.24" kover = "0.8.1" qodana = "2024.1.5" From d320c4195cf9c3e6ebb4c4e06d2f114a5806acf5 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Mon, 29 Jul 2024 07:57:55 +0200 Subject: [PATCH 33/37] Drop `properties(key)` and `environment(key)` helpers and use providers directly --- build.gradle.kts | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3025733a..ae988eef 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,9 +3,6 @@ import org.jetbrains.changelog.markdownToHTML import org.jetbrains.intellij.platform.gradle.Constants.Constraints import org.jetbrains.intellij.platform.gradle.TestFrameworkType -fun properties(key: String) = providers.gradleProperty(key) -fun environment(key: String) = providers.environmentVariable(key) - plugins { id("java") // Java support alias(libs.plugins.kotlin) // Kotlin support @@ -15,8 +12,8 @@ plugins { alias(libs.plugins.kover) // Gradle Kover Plugin } -group = properties("pluginGroup").get() -version = properties("pluginVersion").get() +group = providers.gradleProperty("pluginGroup").get() +version = providers.gradleProperty("pluginVersion").get() // Set the JVM language level used to build the project. kotlin { @@ -39,13 +36,13 @@ dependencies { // IntelliJ Platform Gradle Plugin Dependencies Extension - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html intellijPlatform { - create(properties("platformType"), properties("platformVersion")) + create(providers.gradleProperty("platformType"), providers.gradleProperty("platformVersion")) // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins. - bundledPlugins(properties("platformBundledPlugins").map { it.split(',') }) + bundledPlugins(providers.gradleProperty("platformBundledPlugins").map { it.split(',') }) // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file for plugin from JetBrains Marketplace. - plugins(properties("platformPlugins").map { it.split(',') }) + plugins(providers.gradleProperty("platformPlugins").map { it.split(',') }) instrumentationTools() pluginVerifier() @@ -57,7 +54,7 @@ dependencies { // Configure IntelliJ Platform Gradle Plugin - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-extension.html intellijPlatform { pluginConfiguration { - version = properties("pluginVersion") + version = providers.gradleProperty("pluginVersion") // Extract the section from README.md and provide for the plugin's manifest description = providers.fileContents(layout.projectDirectory.file("README.md")).asText.map { @@ -74,7 +71,7 @@ intellijPlatform { val changelog = project.changelog // local variable for configuration cache compatibility // Get the latest available change notes from the changelog file - changeNotes = properties("pluginVersion").map { pluginVersion -> + changeNotes = providers.gradleProperty("pluginVersion").map { pluginVersion -> with(changelog) { renderItem( (getOrNull(pluginVersion) ?: getUnreleased()) @@ -86,23 +83,23 @@ intellijPlatform { } ideaVersion { - sinceBuild = properties("pluginSinceBuild") - untilBuild = properties("pluginUntilBuild") + sinceBuild = providers.gradleProperty("pluginSinceBuild") + untilBuild = providers.gradleProperty("pluginUntilBuild") } } signing { - certificateChain = environment("CERTIFICATE_CHAIN") - privateKey = environment("PRIVATE_KEY") - password = environment("PRIVATE_KEY_PASSWORD") + certificateChain = providers.environmentVariable("CERTIFICATE_CHAIN") + privateKey = providers.environmentVariable("PRIVATE_KEY") + password = providers.environmentVariable("PRIVATE_KEY_PASSWORD") } publishing { - token = environment("PUBLISH_TOKEN") + 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 - channels = properties("pluginVersion").map { listOf(it.substringAfter('-', "").substringBefore('.').ifEmpty { "default" }) } + channels = providers.gradleProperty("pluginVersion").map { listOf(it.substringAfter('-', "").substringBefore('.').ifEmpty { "default" }) } } verifyPlugin { @@ -115,7 +112,7 @@ intellijPlatform { // Configure Gradle Changelog Plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin changelog { groups.empty() - repositoryUrl = properties("pluginRepositoryUrl") + repositoryUrl = providers.gradleProperty("pluginRepositoryUrl") } // Configure Gradle Kover Plugin - read more: https://github.com/Kotlin/kotlinx-kover#configuration @@ -131,7 +128,7 @@ kover { tasks { wrapper { - gradleVersion = properties("gradleVersion").get() + gradleVersion = providers.gradleProperty("gradleVersion").get() } publishPlugin { From b9470281716a87c9f45935fc4930773879822206 Mon Sep 17 00:00:00 2001 From: Jakub Chrzanowski Date: Tue, 30 Jul 2024 20:13:38 +0200 Subject: [PATCH 34/37] Update .run actions --- .run/Run IDE for UI Tests.run.xml | 25 ------------------------- .run/Run Qodana.run.xml | 24 ------------------------ .run/Run Verifications.run.xml | 7 +++---- 3 files changed, 3 insertions(+), 53 deletions(-) delete mode 100644 .run/Run IDE for UI Tests.run.xml delete mode 100644 .run/Run Qodana.run.xml diff --git a/.run/Run IDE for UI Tests.run.xml b/.run/Run IDE for UI Tests.run.xml deleted file mode 100644 index ee99b7ed..00000000 --- a/.run/Run IDE for UI Tests.run.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - true - true - false - false - - - \ No newline at end of file diff --git a/.run/Run Qodana.run.xml b/.run/Run Qodana.run.xml deleted file mode 100644 index 6b31b811..00000000 --- a/.run/Run Qodana.run.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - true - true - false - false - - - \ No newline at end of file diff --git a/.run/Run Verifications.run.xml b/.run/Run Verifications.run.xml index 3a8d6885..32783f57 100644 --- a/.run/Run Verifications.run.xml +++ b/.run/Run Verifications.run.xml @@ -11,7 +11,7 @@