|
47 | 47 | import org.gradle.internal.component.external.model.DefaultModuleComponentIdentifier;
|
48 | 48 | import org.gradle.internal.component.external.model.ImmutableCapabilities;
|
49 | 49 | import org.gradle.internal.component.model.ComponentArtifactMetadata;
|
50 |
| -import org.gradle.internal.component.model.ComponentArtifactResolveState; |
| 50 | +import org.gradle.internal.component.model.ComponentArtifactResolveMetadata; |
51 | 51 | import org.gradle.internal.component.model.DefaultComponentOverrideMetadata;
|
52 | 52 | import org.gradle.internal.resolve.resolver.ArtifactResolver;
|
53 | 53 | import org.gradle.internal.resolve.resolver.ComponentMetaDataResolver;
|
@@ -193,31 +193,33 @@ private ComponentIdentifier validateComponentIdentifier(ComponentIdentifier comp
|
193 | 193 | private ComponentArtifactsResult buildComponentResult(ComponentIdentifier componentId, ComponentMetaDataResolver componentMetaDataResolver, ArtifactResolver artifactResolver) {
|
194 | 194 | BuildableComponentResolveResult moduleResolveResult = new DefaultBuildableComponentResolveResult();
|
195 | 195 | componentMetaDataResolver.resolve(componentId, DefaultComponentOverrideMetadata.EMPTY, moduleResolveResult);
|
196 |
| - ComponentArtifactResolveState componentState = moduleResolveResult.getState().prepareForArtifactResolution(); |
197 |
| - DefaultComponentArtifactsResult componentResult = new DefaultComponentArtifactsResult(componentState.getId()); |
| 196 | + ComponentArtifactResolveMetadata component = moduleResolveResult.getState().prepareForArtifactResolution().getArtifactMetadata(); |
| 197 | + DefaultComponentArtifactsResult componentResult = new DefaultComponentArtifactsResult(component.getId()); |
198 | 198 | for (Class<? extends Artifact> artifactType : artifactTypes) {
|
199 |
| - moduleResolveResult.getModuleVersionId(); |
200 |
| - addArtifacts(componentResult, artifactType, componentState, artifactResolver); |
| 199 | + addArtifacts(componentResult, artifactType, component, artifactResolver); |
201 | 200 | }
|
202 | 201 | return componentResult;
|
203 | 202 | }
|
204 | 203 |
|
205 |
| - private <T extends Artifact> void addArtifacts(DefaultComponentArtifactsResult artifacts, Class<T> type, ComponentArtifactResolveState componentState, ArtifactResolver artifactResolver) { |
| 204 | + private <T extends Artifact> void addArtifacts( |
| 205 | + DefaultComponentArtifactsResult artifacts, |
| 206 | + Class<T> type, |
| 207 | + ComponentArtifactResolveMetadata component, |
| 208 | + ArtifactResolver artifactResolver |
| 209 | + ) { |
206 | 210 | BuildableArtifactSetResolveResult artifactSetResolveResult = new DefaultBuildableArtifactSetResolveResult();
|
207 |
| - componentState.resolveArtifactsWithType(artifactResolver, convertType(type), artifactSetResolveResult); |
| 211 | + ArtifactType artifactType = componentTypeRegistry.getComponentRegistration(componentType).getArtifactType(type); |
| 212 | + artifactResolver.resolveArtifactsWithType(component, artifactType, artifactSetResolveResult); |
208 | 213 |
|
209 | 214 | for (ComponentArtifactMetadata artifactMetaData : artifactSetResolveResult.getResult()) {
|
210 | 215 | BuildableArtifactResolveResult resolveResult = new DefaultBuildableArtifactResolveResult();
|
211 |
| - artifactResolver.resolveArtifact(componentState.getArtifactMetadata(), artifactMetaData, resolveResult); |
| 216 | + artifactResolver.resolveArtifact(component, artifactMetaData, resolveResult); |
212 | 217 | try {
|
213 |
| - artifacts.addArtifact(externalResolverFactory.verifiedArtifact(new DefaultResolvedArtifactResult(artifactMetaData.getId(), ImmutableAttributes.EMPTY, ImmutableCapabilities.EMPTY, Describables.of(componentState.getId().getDisplayName()), type, resolveResult.getResult().getFile()))); |
| 218 | + artifacts.addArtifact(externalResolverFactory.verifiedArtifact(new DefaultResolvedArtifactResult(artifactMetaData.getId(), ImmutableAttributes.EMPTY, ImmutableCapabilities.EMPTY, Describables.of(component.getId().getDisplayName()), type, resolveResult.getResult().getFile()))); |
214 | 219 | } catch (Exception e) {
|
215 | 220 | artifacts.addArtifact(new DefaultUnresolvedArtifactResult(artifactMetaData.getId(), type, e));
|
216 | 221 | }
|
217 | 222 | }
|
218 | 223 | }
|
219 | 224 |
|
220 |
| - private <T extends Artifact> ArtifactType convertType(Class<T> requestedType) { |
221 |
| - return componentTypeRegistry.getComponentRegistration(componentType).getArtifactType(requestedType); |
222 |
| - } |
223 | 225 | }
|
0 commit comments