This commit is contained in:
Phillip Webb
2014-12-09 13:59:15 -08:00
parent f49d3518a8
commit 3523bca79b
3 changed files with 47 additions and 54 deletions

View File

@@ -82,17 +82,14 @@ class ProjectLibraries implements Libraries {
}
else {
Set<GradleLibrary> compile = getLibraries("compile", LibraryScope.COMPILE);
Set<GradleLibrary> runtime = getLibraries("runtime", LibraryScope.RUNTIME);
runtime = minus(runtime, compile);
Set<GradleLibrary> provided = getLibraries(this.providedConfigurationName,
LibraryScope.PROVIDED);
if (provided != null) {
compile = minus(compile, provided);
runtime = minus(runtime, provided);
}
libraries(compile, callback);
libraries(runtime, callback);
libraries(provided, callback);
@@ -111,7 +108,6 @@ class ProjectLibraries implements Libraries {
libraries.add(new ResolvedArtifactLibrary(artifact, scope));
}
libraries.addAll(getLibrariesForFileDependencies(configuration, scope));
return libraries;
}