37
37
import org .gradle .api .Project ;
38
38
import org .gradle .api .logging .LogLevel ;
39
39
import org .gradle .api .plugins .JavaBasePlugin ;
40
+ import org .gradle .api .provider .Provider ;
40
41
import org .gradle .api .tasks .Copy ;
41
42
import org .gradle .api .tasks .TaskContainer ;
42
43
@@ -118,8 +119,7 @@ private void configureGenerateAntoraYmlTask(Project project, GenerateAntoraYmlTa
118
119
generateAntoraYmlTask .setProperty ("outputFile" ,
119
120
new File (project .getBuildDir (), "generated/docs/antora-yml/antora.yml" ));
120
121
generateAntoraYmlTask .setProperty ("yml" , getDefaultYml (project ));
121
- generateAntoraYmlTask .doFirst ((task ) -> generateAntoraYmlTask .getAsciidocAttributes ()
122
- .putAll (project .provider (() -> getAsciidocAttributes (project , dependencyVersionsTask ))));
122
+ generateAntoraYmlTask .getAsciidocAttributes ().putAll (getAsciidocAttributes (project , dependencyVersionsTask ));
123
123
}
124
124
125
125
private Map <String , ?> getDefaultYml (Project project ) {
@@ -138,12 +138,14 @@ private void configureGenerateAntoraYmlTask(Project project, GenerateAntoraYmlTa
138
138
return defaultYml ;
139
139
}
140
140
141
- private Map <String , String > getAsciidocAttributes (Project project ,
141
+ private Provider < Map <String , String > > getAsciidocAttributes (Project project ,
142
142
ExtractVersionConstraints dependencyVersionsTask ) {
143
- BomExtension bom = (BomExtension ) project .project (DEPENDENCIES_PATH ).getExtensions ().getByName ("bom" );
144
- Map <String , String > dependencyVersions = dependencyVersionsTask .getVersionConstraints ();
145
- AntoraAsciidocAttributes attributes = new AntoraAsciidocAttributes (project , bom , dependencyVersions );
146
- return attributes .get ();
143
+ return project .provider (() -> {
144
+ BomExtension bom = (BomExtension ) project .project (DEPENDENCIES_PATH ).getExtensions ().getByName ("bom" );
145
+ Map <String , String > dependencyVersions = dependencyVersionsTask .getVersionConstraints ();
146
+ AntoraAsciidocAttributes attributes = new AntoraAsciidocAttributes (project , bom , dependencyVersions );
147
+ return attributes .get ();
148
+ });
147
149
}
148
150
149
151
private void configureAntoraTask (Project project , AntoraTask antoraTask , NpmInstallTask npmInstallTask ,
0 commit comments