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

gradle: do not confuse main module artifacts with test artifacts

Browse Source
This commit is contained in:
Vladislav.Soroka
2015-12-25 16:43:50 +03:00
parent 82d41d0859
commit a01d73ff0e
2 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
+6 -2
View File
@@ -196,8 +196,12 @@ public class BaseGradleProjectResolverExtension implements GradleProjectResolver
if (defaultArtifacts != null) {
artifacts.addAll(defaultArtifacts);
}
final Set<File> archivesArtifacts = externalProject.getArtifactsByConfiguration().get("archives");
if (archivesArtifacts != null) {
if (externalProject.getArtifactsByConfiguration().get("archives") != null) {
final Set<File> archivesArtifacts = ContainerUtil.newHashSet(externalProject.getArtifactsByConfiguration().get("archives"));
final Set<File> testsArtifacts = externalProject.getArtifactsByConfiguration().get("tests");
if (testsArtifacts != null) {
archivesArtifacts.removeAll(testsArtifacts);
}
artifacts.addAll(archivesArtifacts);
}
} else if("test".equals(sourceSet.getName())) {
plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleDependenciesImportingTest.java
+38
View File
@@ -206,4 +206,42 @@ public class GradleDependenciesImportingTest extends GradleImportingTestCase {
assertModuleLibDep("project_main", depName, "file://" + path);
assertModuleLibDepScope("project_main", depName, DependencyScope.RUNTIME);
}
@Test
public void testProjectArtifactDependencyInTestAndArchivesConfigurations() throws Exception {
createSettingsFile("include 'api', 'impl' ");
importProject(
"allprojects {\n" +
" apply plugin: 'java'\n" +
"}\n" +
"\n" +
"project(\"api\") {\n" +
" configurations {\n" +
" tests\n" +
" }\n" +
" task testJar(type: Jar, dependsOn: testClasses, description: \"archive the testClasses\") {\n" +
" baseName = \"${project.archivesBaseName}-tests\"\n" +
" classifier = \"tests\"\n" +
" from sourceSets.test.output\n" +
" }\n" +
" artifacts {\n" +
" tests testJar\n" +
" archives testJar\n" +
" }\n" +
"}\n" +
"project(\"impl\") {\n" +
" dependencies {\n" +
" testCompile project(path: ':api', configuration: 'tests')\n" +
" }\n" +
"}\n"
);
assertModules("project", "project_main", "project_test", "api", "api_main", "api_test", "impl", "impl_main", "impl_test");
assertModuleModuleDepScope("project_test", "project_main", DependencyScope.COMPILE);
assertModuleModuleDepScope("api_test", "api_main", DependencyScope.COMPILE);
assertModuleModuleDepScope("impl_test", "impl_main", DependencyScope.COMPILE);
assertModuleModuleDepScope("impl_test", "api_test", DependencyScope.COMPILE);
}
}