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

IDEA-158769 Gradle dependency on test output overrides dependency

Browse Source
This commit is contained in:
Vladislav.Soroka
2016-08-04 15:24:11 +03:00
parent b5958f369c
commit e78133c41e
4 changed files with 65 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolver.java
+5 -6
View File
@@ -438,13 +438,12 @@ public class GradleProjectResolver implements ExternalSystemProjectResolver<Grad
}
else {
final Set<String> testSet = ContainerUtil.newHashSet();
Map<ExternalSystemSourceType, String> gradleTestOutputs = pair.first.getUserData(GRADLE_OUTPUTS);
if(gradleTestOutputs != null) {
ContainerUtil.addAllNotNull(compileSet,
gradleTestOutputs.get(ExternalSystemSourceType.TEST),
gradleTestOutputs.get(ExternalSystemSourceType.TEST_RESOURCE));
if(gradleOutputs != null) {
ContainerUtil.addAllNotNull(testSet,
gradleOutputs.get(ExternalSystemSourceType.TEST),
gradleOutputs.get(ExternalSystemSourceType.TEST_RESOURCE));
}
if (compileSet.isEmpty() && ContainerUtil.intersects(libraryPaths, testSet)) {
if (!testSet.isEmpty() && ContainerUtil.intersects(libraryPaths, testSet)) {
targetModuleOutputPaths = testSet;
}
}
plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleDependenciesImportingTest.java
+46
View File
@@ -849,4 +849,50 @@ public class GradleDependenciesImportingTest extends GradleImportingTestCase {
}
assertModuleModuleDepScope("projectC", "projectB", DependencyScope.PROVIDED);
}
@Test
public void testProjectConfigurationDependencyWithDependencyOnTestOutput() throws Exception {
createSettingsFile("include 'project1'\n" +
"include 'project2'\n");
importProject(
"project(':project1') {\n" +
" apply plugin: 'java'\n" +
" configurations {\n" +
" testOutput\n" +
" testOutput.extendsFrom (testCompile)\n" +
" }\n" +
"\n" +
" dependencies {\n" +
" testOutput sourceSets.test.output\n" +
" testCompile group: 'junit', name: 'junit', version: '4.11'\n" +
" }\n" +
"}\n" +
"\n" +
"project(':project2') {\n" +
" apply plugin: 'java'\n" +
" dependencies {\n" +
" compile project(path: ':project1')\n" +
"\n" +
" testCompile group: 'junit', name: 'junit', version: '4.11'\n" +
" testCompile project(path: ':project1', configuration: 'testOutput')\n" +
" }\n" +
"\n" +
"}\n"
);
assertModules("project", "project1", "project1_main", "project1_test", "project2", "project2_main", "project2_test");
assertModuleModuleDepScope("project1_test", "project1_main", DependencyScope.COMPILE);
assertModuleLibDepScope("project1_test", "Gradle: junit:junit:4.11", DependencyScope.COMPILE);
assertModuleLibDepScope("project1_test", "Gradle: org.hamcrest:hamcrest-core:1.3", DependencyScope.COMPILE);
assertModuleModuleDepScope("project2_main", "project1_main", DependencyScope.COMPILE);
assertModuleModuleDepScope("project2_test", "project2_main", DependencyScope.COMPILE);
assertModuleModuleDepScope("project2_test", "project1_test", DependencyScope.COMPILE);
assertModuleModuleDepScope("project2_test", "project1_main", DependencyScope.COMPILE);
assertModuleLibDepScope("project2_test", "Gradle: junit:junit:4.11", DependencyScope.COMPILE);
assertModuleLibDepScope("project2_test", "Gradle: org.hamcrest:hamcrest-core:1.3", DependencyScope.COMPILE);
}
}
plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/model/DefaultExternalProjectDependency.java
+4
View File
@@ -63,6 +63,10 @@ public class DefaultExternalProjectDependency extends AbstractExternalDependency
public void setConfigurationName(String configurationName) {
myConfigurationName = configurationName;
// have to differentiate(using different DefaultExternalDependencyId) project dependencies on different configurations
if(!Dependency.DEFAULT_CONFIGURATION.equals(configurationName)){
setClassifier(configurationName);
}
}
@Override
plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/util/DependencyResolverImpl.groovy
+10 -1
View File
@@ -155,10 +155,19 @@ class DependencyResolverImpl implements DependencyResolver {
ResolutionResult resolutionResult = configuration.incoming.resolutionResult
if(!configuration.resolvedConfiguration.hasError()) {
def fileDeps = new LinkedHashSet<File>(configuration.incoming.files.files);
Collection<File> fileDeps = new LinkedHashSet<File>(configuration.incoming.files.files);
artifactMap.values().each {
fileDeps.remove(it.file)
}
configurationProjectDependencies.values().each {
def intersect = fileDeps.intersect(it.resolve())
if(!intersect.isEmpty()) {
def fileCollectionDependency = new DefaultFileCollectionDependency(intersect)
fileCollectionDependency.scope = scope
result.add(fileCollectionDependency)
fileDeps.removeAll(intersect)
}
}
fileDeps.each {
def fileCollectionDependency = new DefaultFileCollectionDependency([it])
fileCollectionDependency.scope = scope