MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

add classifier and type information to external dep id

Browse Source
This commit is contained in:
Nikita Skvortsov
2018-05-23 09:55:03 +03:00
parent 91b46c79a3
commit 6cd68de219
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/ScopedExternalDependenciesFactory.java
+9 -1
View File
@@ -13,8 +13,10 @@ import org.gradle.api.component.Artifact;
import org.gradle.api.internal.file.copy.CopySpecInternal;
import org.gradle.api.tasks.SourceSetOutput;
import org.gradle.api.tasks.bundling.AbstractArchiveTask;
import org.gradle.internal.component.external.model.DefaultModuleComponentArtifactIdentifier;
import org.gradle.internal.component.local.model.LocalComponentArtifactMetadata;
import org.gradle.internal.component.local.model.PublishArtifactLocalArtifactMetadata;
import org.gradle.internal.component.model.IvyArtifactName;
import org.gradle.language.base.artifact.SourcesArtifact;
import org.gradle.language.java.artifact.JavadocArtifact;
import org.jetbrains.annotations.NotNull;
@@ -139,15 +141,21 @@ class ScopedExternalDependenciesFactory {
private ExternalDependency createExternalLibraryDependency(@NotNull ResolvedArtifactResult artifact,
@Nullable Map<Class<? extends Artifact>, Set<ResolvedArtifactResult>> sourcesAndJavadocs) {
ModuleComponentIdentifier id = (ModuleComponentIdentifier)artifact.getId().getComponentIdentifier();
final IvyArtifactName ivyName = ((DefaultModuleComponentArtifactIdentifier)artifact.getId()).getName();
String packaging = ivyName.getType() != null ? ivyName.getType() : "jar";
String classifier = ivyName.getClassifier();
DefaultExternalLibraryDependency externalLibDep = new DefaultExternalLibraryDependency();
externalLibDep.setName(id.getModule());
externalLibDep.setGroup(id.getGroup());
externalLibDep.setVersion(id.getVersion());
externalLibDep.setFile(artifact.getFile());
externalLibDep.setScope(myScope);
externalLibDep.setPackaging(packaging);
externalLibDep.setClassifier(classifier);
File javadocFile = extractFile(JavadocArtifact.class, sourcesAndJavadocs);
if (javadocFile != null) {
externalLibDep.setJavadoc(javadocFile);