Merge pull request #23435 from celcius112

* gh-23435:
  Configure the bootBuildInfo task lazily

Closes gh-23435
pull/23540/head
Andy Wilkinson 4 years ago
commit abfed6e0a7

@ -96,16 +96,16 @@ public class SpringBootExtension {
TaskProvider<BuildInfo> bootBuildInfo = tasks.register("bootBuildInfo", BuildInfo.class, TaskProvider<BuildInfo> bootBuildInfo = tasks.register("bootBuildInfo", BuildInfo.class,
this::configureBuildInfoTask); this::configureBuildInfoTask);
this.project.getPlugins().withType(JavaPlugin.class, (plugin) -> { this.project.getPlugins().withType(JavaPlugin.class, (plugin) -> {
tasks.getByName(JavaPlugin.CLASSES_TASK_NAME).dependsOn(bootBuildInfo.get()); tasks.named(JavaPlugin.CLASSES_TASK_NAME).configure((task) -> task.dependsOn(bootBuildInfo));
this.project.afterEvaluate((evaluated) -> { this.project.afterEvaluate((evaluated) -> bootBuildInfo.configure((buildInfo) -> {
BuildInfoProperties properties = bootBuildInfo.get().getProperties(); BuildInfoProperties properties = buildInfo.getProperties();
if (properties.getArtifact() == null) { if (properties.getArtifact() == null) {
properties.setArtifact(determineArtifactBaseName()); properties.setArtifact(determineArtifactBaseName());
} }
}); }));
}); });
if (configurer != null) { if (configurer != null) {
configurer.execute(bootBuildInfo.get()); bootBuildInfo.configure(configurer);
} }
} }

Loading…
Cancel
Save