From b296ba1c50c4a1f5638919e4296408a1eea38c0a Mon Sep 17 00:00:00 2001 From: Daniel Lacasse Date: Wed, 10 Jul 2024 14:38:33 -0400 Subject: [PATCH] Improve supports for minimum Gradle support and custom plugin source set Signed-off-by: Daniel Lacasse --- .../rules/GradlePluginDevelopmentDependenciesRule.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/subprojects/gradle-plugin-development/src/main/java/dev/gradleplugins/internal/rules/GradlePluginDevelopmentDependenciesRule.java b/subprojects/gradle-plugin-development/src/main/java/dev/gradleplugins/internal/rules/GradlePluginDevelopmentDependenciesRule.java index 7b25f8c..fffa243 100644 --- a/subprojects/gradle-plugin-development/src/main/java/dev/gradleplugins/internal/rules/GradlePluginDevelopmentDependenciesRule.java +++ b/subprojects/gradle-plugin-development/src/main/java/dev/gradleplugins/internal/rules/GradlePluginDevelopmentDependenciesRule.java @@ -125,13 +125,11 @@ public void execute(Project ___) { }); } - if (!extension.getPluginSourceSet().getName().equals("main")) { - apiElements.extendsFrom(api); - apiElements.extendsFrom(compileOnlyApi); + apiElements.extendsFrom(api); + apiElements.extendsFrom(compileOnlyApi); - runtimeElements.extendsFrom(project.getConfigurations().getByName(extension.getPluginSourceSet().getImplementationConfigurationName())); - runtimeElements.extendsFrom(project.getConfigurations().getByName(extension.getPluginSourceSet().getRuntimeOnlyConfigurationName())); - } + runtimeElements.extendsFrom(project.getConfigurations().getByName(extension.getPluginSourceSet().getImplementationConfigurationName())); + runtimeElements.extendsFrom(project.getConfigurations().getByName(extension.getPluginSourceSet().getRuntimeOnlyConfigurationName())); } private /*static*/ String compileOnlyApiConfigurationName(SourceSet sourceSet) {