Merge branch '1.5.x'
This commit is contained in:
commit
6b1a80ac2a
|
@ -127,8 +127,11 @@ class ProjectLibraries implements Libraries {
|
||||||
}
|
}
|
||||||
else if (dependency instanceof ProjectDependency) {
|
else if (dependency instanceof ProjectDependency) {
|
||||||
ProjectDependency projectDependency = (ProjectDependency) dependency;
|
ProjectDependency projectDependency = (ProjectDependency) dependency;
|
||||||
libraries.addAll(getLibrariesForFileDependencies(
|
Configuration dependencyConfiguration = projectDependency
|
||||||
projectDependency.getProjectConfiguration(), scope));
|
.getDependencyProject().getConfigurations()
|
||||||
|
.getByName(projectDependency.getConfiguration());
|
||||||
|
libraries.addAll(
|
||||||
|
getLibrariesForFileDependencies(dependencyConfiguration, scope));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return libraries;
|
return libraries;
|
||||||
|
|
Loading…
Reference in New Issue