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

extract configuration name from ivy classifier

Browse Source
This commit is contained in:
Nikita Skvortsov
2018-05-23 09:55:06 +03:00
parent 9a6f2ce140
commit e1db7deda0
1 changed files with 8 additions and 7 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
+8 -7
View File
@@ -31,7 +31,8 @@ class ScopedExternalDependenciesFactory {
@Nullable private final String myScope;
private final Project myProject;
public ScopedExternalDependenciesFactory(@NotNull Project project, @Nullable String scope) {
public ScopedExternalDependenciesFactory(@NotNull Project project,
@Nullable String scope) {
myScope = scope;
myProject = project;
}
@@ -76,6 +77,7 @@ class ScopedExternalDependenciesFactory {
private ExternalDependency createProjectDependency(@NotNull ResolvedArtifactResult artifact) {
ProjectComponentIdentifier id = (ProjectComponentIdentifier)artifact.getId().getComponentIdentifier();
DefaultExternalProjectDependency projectDependency = new DefaultExternalProjectDependency();
Project targetProject = myProject.getRootProject().findProject(id.getProjectPath());
@@ -83,14 +85,13 @@ class ScopedExternalDependenciesFactory {
projectDependency.setGroup(targetProject.getGroup().toString());
projectDependency.setVersion(targetProject.getVersion().toString());
projectDependency.setProjectPath(id.getProjectPath());
projectDependency.setProjectDependencyArtifacts(Collections.singleton(artifact.getFile()));
projectDependency.setScope(myScope);
projectDependency.setProjectDependencyArtifacts(Collections.singleton(artifact.getFile()));
projectDependency.setConfigurationName(artifact.getFile().getName());
if (artifact.getId() instanceof PublishArtifactLocalArtifactMetadata) {
LocalComponentArtifactMetadata artifactMetadata = (LocalComponentArtifactMetadata)artifact.getId();
projectDependency.setConfigurationName(artifactMetadata.getName().getClassifier());
try {
Field publishArtifactField = artifactMetadata.getClass().getField("publishArtifact");
@@ -115,7 +116,7 @@ class ScopedExternalDependenciesFactory {
return projectDependency;
}
private Set<File> collectSourceRootOutputs(CopySpecInternal spec) {
private static Set<File> collectSourceRootOutputs(CopySpecInternal spec) {
Set<File> result = new LinkedHashSet<File>();
final List<MetaMethod> sourcePathGetters =
DefaultGroovyMethods.respondsTo(spec, "getSourcePaths", new Object[]{});
@@ -179,8 +180,8 @@ class ScopedExternalDependenciesFactory {
@Nullable
private File extractFile(@NotNull Class<? extends Artifact> type,
@Nullable Map<Class<? extends Artifact>, Set<ResolvedArtifactResult>> container) {
private static File extractFile(@NotNull Class<? extends Artifact> type,
@Nullable Map<Class<? extends Artifact>, Set<ResolvedArtifactResult>> container) {
if (container == null) {
return null;
}