Skip to content

Commit df7acfc

Browse files
authored
Use 'exportsTo' and 'opensTo' statements from Module Info DSL (#100)
Picked up things defined via 'java-module-dependencies' plugin.
1 parent 8137489 commit df7acfc

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

src/main/java/org/gradlex/javamodule/testing/JavaModuleTestingExtension.java

+2
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,9 @@ private void configureJvmTestSuiteForWhitebox(JvmTestSuite jvmTestSuite, Whitebo
252252
});
253253
argumentProvider.testRequires(JavaModuleDependenciesBridge.getRuntimeClasspathModules(project, testSources));
254254
argumentProvider.testRequires(whiteboxJvmTestSuite.getRequires());
255+
argumentProvider.testOpensTo(JavaModuleDependenciesBridge.getOpensToModules(project, testSources));
255256
argumentProvider.testOpensTo(whiteboxJvmTestSuite.getOpensTo());
257+
argumentProvider.testExportsTo(JavaModuleDependenciesBridge.getExportsToModules(project, testSources));
256258
argumentProvider.testExportsTo(whiteboxJvmTestSuite.getExportsTo());
257259
});
258260

src/main/java/org/gradlex/javamodule/testing/internal/bridges/JavaModuleDependenciesBridge.java

+11-3
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,22 @@ public static void addRequiresRuntimeSupport(Project project, SourceSet sourceSe
5656
}
5757

5858
public static List<String> getRuntimeClasspathModules(Project project, SourceSet sourceSet) {
59-
return getClasspathModules("getRuntimeClasspathModules", project, sourceSet);
59+
return getDeclaredModules("getRuntimeClasspathModules", project, sourceSet);
6060
}
6161

6262
public static List<String> getCompileClasspathModules(Project project, SourceSet sourceSet) {
63-
return getClasspathModules("getCompileClasspathModules", project, sourceSet);
63+
return getDeclaredModules("getCompileClasspathModules", project, sourceSet);
6464
}
6565

66-
public static List<String> getClasspathModules(String getter, Project project, SourceSet sourceSet) {
66+
public static List<String> getExportsToModules(Project project, SourceSet sourceSet) {
67+
return getDeclaredModules("getExportsToModules", project, sourceSet);
68+
}
69+
70+
public static List<String> getOpensToModules(Project project, SourceSet sourceSet) {
71+
return getDeclaredModules("getOpensToModules", project, sourceSet);
72+
}
73+
74+
private static List<String> getDeclaredModules(String getter, Project project, SourceSet sourceSet) {
6775
Object moduleInfoDslExtension = project.getExtensions().findByName(sourceSet.getName() + "ModuleInfo");
6876
if (moduleInfoDslExtension == null) {
6977
return Collections.emptyList();

src/main/java/org/gradlex/javamodule/testing/internal/provider/WhiteboxTestRuntimeArgumentProvider.java

+8
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,18 @@ public void testOpensTo(Provider<List<String>> testOpensTo) {
6666
allTestOpensTo.addAll(testOpensTo);
6767
}
6868

69+
public void testOpensTo(List<String> testOpensTo) {
70+
allTestOpensTo.addAll(testOpensTo);
71+
}
72+
6973
public void testExportsTo(Provider<List<String>> testExportsTo) {
7074
allTestExportsTo.addAll(testExportsTo);
7175
}
7276

77+
public void testExportsTo(List<String> testExportsTo) {
78+
allTestExportsTo.addAll(testExportsTo);
79+
}
80+
7381
@Override
7482
public Iterable<String> asArguments() {
7583
String moduleName = moduleInfoParser.moduleName(mainSourceFolders);

0 commit comments

Comments
 (0)