Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Exclude developmentOnly dependences from AOT processing classpaths

Browse Source 
Fixes gh-35433
This commit is contained in:
Andy Wilkinson
2023-05-16 09:26:20 +01:00
parent 25375679e6
commit c39a37cd23
4 changed files with 75 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/plugin/SpringBootAotPlugin.java
View File

@@ -16,6 +16,9 @@
package org.springframework.boot.gradle.plugin;
import java.util.Set;
import java.util.stream.Stream;
import org.gradle.api.Plugin;
import org.gradle.api.Project;
import org.gradle.api.artifacts.Configuration;
@@ -155,7 +158,7 @@ public class SpringBootAotPlugin implements Plugin<Project> {
classpath.setCanBeConsumed(false);
classpath.setCanBeResolved(true);
classpath.setDescription("Classpath of the " + taskName + " task.");
base.getExtendsFrom().forEach(classpath::extendsFrom);
removeDevelopmentOnly(base.getExtendsFrom()).forEach(classpath::extendsFrom);
classpath.attributes((attributes) -> {
AttributeContainer baseAttributes = base.getAttributes();
for (Attribute<?> attribute : baseAttributes.keySet()) {
@@ -166,6 +169,14 @@ public class SpringBootAotPlugin implements Plugin<Project> {
return aotClasspath;
}
private Stream<Configuration> removeDevelopmentOnly(Set<Configuration> configurations) {
return configurations.stream().filter(this::isNotDevelopmentOnly);
}
private boolean isNotDevelopmentOnly(Configuration configuration) {
return !SpringBootPlugin.DEVELOPMENT_ONLY_CONFIGURATION_NAME.equals(configuration.getName());
}
private void configureDependsOn(Project project, SourceSet aotSourceSet,
TaskProvider<? extends AbstractAot> processAot) {
project.getTasks()