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: don't replace '-' in module names

Browse Source
This commit is contained in:
Vladislav.Soroka
2016-02-12 14:59:01 +03:00
parent febf953b68
commit cd3df996f1
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java
+1 -1
View File
@@ -235,7 +235,7 @@ public class BaseGradleProjectResolverExtension implements GradleProjectResolver
@NotNull
private static String getInternalModuleName(@NotNull IdeaModule gradleModule, @NotNull String sourceSetName) {
return FileUtil.sanitizeFileName(gradleModule.getName() + "_" + sourceSetName);
return PathUtilRt.suggestFileName(gradleModule.getName() + "_" + sourceSetName, true, false);
}
@Override
plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleDependenciesImportingTest.java
+5 -5
View File
@@ -269,11 +269,11 @@ public class GradleDependenciesImportingTest extends GradleImportingTestCase {
"}\n"
);
assertModules("project", "project1", "project1_main", "project1_test", "project2", "project2_main", "project2_test", "project-tests", "project_tests_main", "project_tests_test");
assertModules("project", "project1", "project1_main", "project1_test", "project2", "project2_main", "project2_test", "project-tests", "project-tests_main", "project-tests_test");
assertModuleModuleDepScope("project_tests_main", "project1_main", DependencyScope.COMPILE);
assertModuleModuleDepScope("project_tests_main", "project2_main", DependencyScope.RUNTIME);
assertModuleLibDepScope("project_tests_main", "Gradle: org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.0", DependencyScope.COMPILE);
assertModuleLibDepScope("project_tests_main", "Gradle: org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1", DependencyScope.RUNTIME);
assertModuleModuleDepScope("project-tests_main", "project1_main", DependencyScope.COMPILE);
assertModuleModuleDepScope("project-tests_main", "project2_main", DependencyScope.RUNTIME);
assertModuleLibDepScope("project-tests_main", "Gradle: org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.0", DependencyScope.COMPILE);
assertModuleLibDepScope("project-tests_main", "Gradle: org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1", DependencyScope.RUNTIME);
}
}
plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleMiscImportingTest.java
+3 -3
View File
@@ -66,11 +66,11 @@ public class GradleMiscImportingTest extends GradleImportingTestCase {
"apply plugin: 'java'"
);
assertModules("my-project", "my_project_main", "my_project_test");
assertModules("my-project", "my-project_main", "my-project_test");
final Module testModule = getModule("my_project_test");
final Module testModule = getModule("my-project_test");
TestModuleProperties testModuleProperties = TestModuleProperties.getInstance(testModule);
assertEquals("my_project_main", testModuleProperties.getProductionModuleName());
assertEquals("my-project_main", testModuleProperties.getProductionModuleName());
}
@Test