From 01d8b100ae69374d51ff2717b5a674bcd0e7a83a Mon Sep 17 00:00:00 2001 From: Austin Brooks Date: Wed, 22 Jan 2025 10:42:38 -0800 Subject: [PATCH] Add a PluginVerification ide() overload that takes a useInstaller Boolean provider --- CHANGELOG.md | 4 ++++ api/IntelliJPlatformGradlePlugin.api | 1 + .../gradle/extensions/IntelliJPlatformExtension.kt | 14 ++++++++++++++ 3 files changed, 19 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c3fc71fd5..9049b9a2e8 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## [next] +### Added + +- Add `ide(type: Provider<*>, version: Provider, useInstaller: Provider)` overload to the `pluginVerification.ides` block. + ### Fixed - Fixed the broken path resolution in the ` bundledLibrary` helper and the `TestFrameworkType.Bundled` test framework diff --git a/api/IntelliJPlatformGradlePlugin.api b/api/IntelliJPlatformGradlePlugin.api index 9e774d57d8..3cace79bef 100644 --- a/api/IntelliJPlatformGradlePlugin.api +++ b/api/IntelliJPlatformGradlePlugin.api @@ -843,6 +843,7 @@ public abstract class org/jetbrains/intellij/platform/gradle/extensions/IntelliJ public final fun ide (Ljava/lang/String;Ljava/lang/String;Z)V public final fun ide (Lorg/gradle/api/provider/Provider;)V public final fun ide (Lorg/gradle/api/provider/Provider;Lorg/gradle/api/provider/Provider;)V + public final fun ide (Lorg/gradle/api/provider/Provider;Lorg/gradle/api/provider/Provider;Lorg/gradle/api/provider/Provider;)V public final fun ide (Lorg/gradle/api/provider/Provider;Lorg/gradle/api/provider/Provider;Z)V public final fun ide (Lorg/jetbrains/intellij/platform/gradle/IntelliJPlatformType;Ljava/lang/String;)V public final fun ide (Lorg/jetbrains/intellij/platform/gradle/IntelliJPlatformType;Ljava/lang/String;Z)V diff --git a/src/main/kotlin/org/jetbrains/intellij/platform/gradle/extensions/IntelliJPlatformExtension.kt b/src/main/kotlin/org/jetbrains/intellij/platform/gradle/extensions/IntelliJPlatformExtension.kt index bfa9b551e7..d338a65070 100644 --- a/src/main/kotlin/org/jetbrains/intellij/platform/gradle/extensions/IntelliJPlatformExtension.kt +++ b/src/main/kotlin/org/jetbrains/intellij/platform/gradle/extensions/IntelliJPlatformExtension.kt @@ -816,6 +816,20 @@ abstract class IntelliJPlatformExtension @Inject constructor( configurationName = Configurations.INTELLIJ_PLUGIN_VERIFIER_IDES_DEPENDENCY, ) + /** + * Adds a dependency to a binary IDE release to be used for testing with the IntelliJ Plugin Verifier. + * + * @param type The provider for the type of the IntelliJ Platform dependency. Accepts either [IntelliJPlatformType] or [String]. + * @param version The provider for the version of the IntelliJ Platform dependency. + * @param useInstaller Switches between the IDE installer and archive from the IntelliJ Maven repository. + */ + fun ide(type: Provider<*>, version: Provider, useInstaller: Provider) = dependenciesHelper.addIntelliJPlatformDependency( + typeProvider = type, + versionProvider = version, + useInstallerProvider = useInstaller, + configurationName = Configurations.INTELLIJ_PLUGIN_VERIFIER_IDES_DEPENDENCY, + ) + /** * Adds a dependency to a binary IDE release to be used for testing with the IntelliJ Plugin Verifier. *