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: set TestModuleProperties production-module only for 'test' modules (IDEA-151925)

Browse Source
This commit is contained in:
Vladislav.Soroka
2016-03-14 18:46:40 +03:00
parent 00adf434d8
commit 506247e590
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractModuleDataService.java
+1 -3
View File
@@ -92,9 +92,7 @@ public abstract class AbstractModuleDataService<E extends ModuleData> extends Ab
Module module = node.getUserData(MODULE_KEY);
if (module != null) {
String productionModuleId = node.getData().getProductionModuleId();
if (productionModuleId != null) {
modelsProvider.setTestModuleProperties(module, productionModuleId);
}
modelsProvider.setTestModuleProperties(module, productionModuleId);
setModuleOptions(module, node);
ModifiableRootModel modifiableRootModel = modelsProvider.getModifiableRootModel(module);
syncPaths(module, modifiableRootModel, node.getData());
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
+1 -1
View File
@@ -206,8 +206,8 @@ public class BaseGradleProjectResolverExtension implements GradleProjectResolver
}
}
else {
sourceSetData.setProductionModuleId(getInternalModuleName(gradleModule, "main"));
if ("test".equals(sourceSet.getName())) {
sourceSetData.setProductionModuleId(getInternalModuleName(gradleModule, "main"));
final Set<File> testsArtifacts = externalProject.getArtifactsByConfiguration().get("tests");
if (testsArtifacts != null) {
artifacts.addAll(testsArtifacts);