From 7eb46ca0fcc4a239563ba78c2016d5129284d763 Mon Sep 17 00:00:00 2001 From: DeKaN Date: Sun, 29 Sep 2024 16:58:55 +0400 Subject: [PATCH 1/5] Migrate to new IntelliJ Gradle Plugin --- .gitignore | 1 + build.gradle.kts | 50 +++++++++++++++++------- gradle.properties | 6 ++- gradle/libs.versions.toml | 6 +-- gradle/wrapper/gradle-wrapper.properties | 4 +- 5 files changed, 46 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index ebd39ef..63f5961 100644 --- a/.gitignore +++ b/.gitignore @@ -71,6 +71,7 @@ fabric.properties /gitmoji-plugin.jar .idea/ *.iml +.intellijPlatform/ /build/ /.gradle/ diff --git a/build.gradle.kts b/build.gradle.kts index 645bcef..f3941a5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,7 @@ import org.jetbrains.changelog.Changelog import org.jetbrains.changelog.markdownToHTML +import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType +import org.jetbrains.intellij.platform.gradle.models.ProductRelease fun properties(key: String) = providers.gradleProperty(key) fun environment(key: String) = providers.environmentVariable(key) @@ -18,8 +20,11 @@ version = properties("pluginVersion").get() // Configure project's dependencies repositories { - maven("https://www.jetbrains.com/intellij-repository/snapshots/") mavenCentral() + intellijPlatform { + defaultRepositories() + jetbrainsRuntime() + } } // Dependencies are managed with Gradle version catalog - read more: https://docs.gradle.org/current/userguide/platforms.html#sub:version-catalog @@ -28,6 +33,16 @@ dependencies { implementation("com.google.code.gson:gson:2.11.0") implementation("com.squareup.okhttp3:okhttp:4.12.0") implementation("org.yaml:snakeyaml:2.2") + intellijPlatform { + create(type = properties("platformType"), version = properties("platformVersion"), useInstaller = false) + jetbrainsRuntime() + plugins( + properties("platformPlugins").map { it.split(',').map(String::trim).filter(String::isNotEmpty) } + ) + bundledPlugins( + properties("platformBundledPlugins").map { it.split(',').map(String::trim).filter(String::isNotEmpty) } + ) + } } // Set the JVM language level used to build the project. @@ -36,13 +51,10 @@ kotlin { } // 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") - - // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file. - plugins = properties("platformPlugins").map { it.split(',').map(String::trim).filter(String::isNotEmpty) } +intellijPlatform { + pluginConfiguration { + name = properties("pluginName") + } } // Configure Gradle Changelog Plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin @@ -102,11 +114,21 @@ 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") + 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() + } } signPlugin { @@ -123,4 +145,4 @@ tasks { // https://plugins.jetbrains.com/docs/intellij/deployment.html#specifying-a-release-channel channels = properties("pluginVersion").map { listOf(it.substringAfter('-', "").substringBefore('.').ifEmpty { "default" }) } } -} \ No newline at end of file +} diff --git a/gradle.properties b/gradle.properties index 9180681..394cbcd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,8 +17,10 @@ platformType = IC platformVersion = 2024.1 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html -# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22 +# Note: Bundled plugins are now defined separately from plugins of other sources (like JetBrains Marketplace). +# Example: platformBundledPlugins = com.intellij.java, com.jetbrains.php:203.4449.22 platformPlugins = +platformBundledPlugins = # Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3 javaVersion = 17 @@ -36,4 +38,4 @@ org.gradle.configuration-cache = true 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 \ No newline at end of file +systemProp.org.gradle.unsafe.kotlin.assignment = true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ed42a18..edd9b58 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ # plugins kotlin = "2.0.0" changelog = "2.2.1" -gradleIntelliJPlugin = "1.17.4" +gradleIntelliJPlugin = "2.1.0" qodana = "2024.1.5" kover = "0.8.3" @@ -12,7 +12,7 @@ kover = "0.8.3" [plugins] changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" } -gradleIntelliJPlugin = { id = "org.jetbrains.intellij", version.ref = "gradleIntelliJPlugin" } +gradleIntelliJPlugin = { id = "org.jetbrains.intellij.platform", version.ref = "gradleIntelliJPlugin" } 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" } \ No newline at end of file +qodana = { id = "org.jetbrains.qodana", version.ref = "qodana" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 92c1ac1..df97d72 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists \ No newline at end of file +zipStorePath=wrapper/dists From 2598ad367bfbf082a670b6145ce450308ce06257 Mon Sep 17 00:00:00 2001 From: Dmitriy Date: Mon, 30 Sep 2024 02:16:58 +0400 Subject: [PATCH 2/5] Trying to fix workflow --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ffc2b89..9e51ee2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -73,7 +73,7 @@ jobs: echo "$CHANGELOG" >> $GITHUB_OUTPUT echo "EOF" >> $GITHUB_OUTPUT - ./gradlew listProductsReleases # prepare list of IDEs for Plugin Verifier + ./gradlew printProductsReleases # prepare list of IDEs for Plugin Verifier # Build plugin - name: Build plugin From 672bf980f055b7d964f44b73ee11935798d73291 Mon Sep 17 00:00:00 2001 From: Dmitriy Date: Mon, 30 Sep 2024 09:09:41 +0400 Subject: [PATCH 3/5] Add missed dependencies --- build.gradle.kts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index f3941a5..95b52f5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,6 +2,7 @@ import org.jetbrains.changelog.Changelog import org.jetbrains.changelog.markdownToHTML import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType import org.jetbrains.intellij.platform.gradle.models.ProductRelease +import org.jetbrains.intellij.platform.gradle.TestFrameworkType fun properties(key: String) = providers.gradleProperty(key) fun environment(key: String) = providers.environmentVariable(key) @@ -42,6 +43,11 @@ dependencies { bundledPlugins( properties("platformBundledPlugins").map { it.split(',').map(String::trim).filter(String::isNotEmpty) } ) + pluginVerifier() + zipSigner() + instrumentationTools() + + testFramework(TestFrameworkType.Platform) } } From bd63e12f6581ed2e262e11aad0b5a8f03e022502 Mon Sep 17 00:00:00 2001 From: Dmitriy Date: Mon, 30 Sep 2024 22:43:25 +0400 Subject: [PATCH 4/5] Fix verifyPlugin task --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9e51ee2..42a35e6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ # - Run 'test' and 'verifyPlugin' tasks. # - Run Qodana inspections. # - Run the 'buildPlugin' task and prepare artifact for further tests. -# - Run the 'runPluginVerifier' task. +# - Run the 'verifyPlugin' task. # - Create a draft release. # # The workflow is triggered on push and pull_request events. @@ -214,7 +214,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 From 6992885efaaf295ab91942fd703a6be23ea4f0f9 Mon Sep 17 00:00:00 2001 From: Dmitriy Date: Tue, 1 Oct 2024 02:31:49 +0400 Subject: [PATCH 5/5] Fix verifyPlugin task --- build.gradle.kts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 95b52f5..fc26e59 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,6 +6,7 @@ import org.jetbrains.intellij.platform.gradle.TestFrameworkType fun properties(key: String) = providers.gradleProperty(key) fun environment(key: String) = providers.environmentVariable(key) +fun Provider.toList() = map { it.split(',').mapNotNull { s -> s.trim().takeIf(String::isNotEmpty) } } plugins { id("java") // Java support @@ -38,10 +39,10 @@ dependencies { create(type = properties("platformType"), version = properties("platformVersion"), useInstaller = false) jetbrainsRuntime() plugins( - properties("platformPlugins").map { it.split(',').map(String::trim).filter(String::isNotEmpty) } + properties("platformPlugins").toList() ) bundledPlugins( - properties("platformBundledPlugins").map { it.split(',').map(String::trim).filter(String::isNotEmpty) } + properties("platformBundledPlugins").toList() ) pluginVerifier() zipSigner() @@ -61,6 +62,12 @@ intellijPlatform { pluginConfiguration { name = properties("pluginName") } + pluginVerification { + freeArgs = listOf("-mute", "TemplateWordInPluginName") + ides { + ide(type = properties("platformType"), version = properties("platformVersion"), useInstaller = false) + } + } } // Configure Gradle Changelog Plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin @@ -87,7 +94,7 @@ tasks { } patchPluginXml { - version = properties("pluginVersion") + version = properties("pluginVersion").get() sinceBuild = properties("pluginSinceBuild") untilBuild = properties("pluginUntilBuild")