Skip to content

Use 'exportsTo' and 'opensTo' statements from Module Info DSL #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 16, 2025
Merged

Use 'exportsTo' and 'opensTo' statements from Module Info DSL #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/java/org/gradlex/javamodule/testing/JavaModuleTestingExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,9 @@ private void configureJvmTestSuiteForWhitebox(JvmTestSuite jvmTestSuite, Whitebo
});
argumentProvider.testRequires(JavaModuleDependenciesBridge.getRuntimeClasspathModules(project, testSources));
argumentProvider.testRequires(whiteboxJvmTestSuite.getRequires());
argumentProvider.testOpensTo(JavaModuleDependenciesBridge.getOpensToModules(project, testSources));
argumentProvider.testOpensTo(whiteboxJvmTestSuite.getOpensTo());
argumentProvider.testExportsTo(JavaModuleDependenciesBridge.getExportsToModules(project, testSources));
argumentProvider.testExportsTo(whiteboxJvmTestSuite.getExportsTo());
});

Expand Down
14 changes: 11 additions & 3 deletions ...in/java/org/gradlex/javamodule/testing/internal/bridges/JavaModuleDependenciesBridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,22 @@ public static void addRequiresRuntimeSupport(Project project, SourceSet sourceSe
}

public static List<String> getRuntimeClasspathModules(Project project, SourceSet sourceSet) {
return getClasspathModules("getRuntimeClasspathModules", project, sourceSet);
return getDeclaredModules("getRuntimeClasspathModules", project, sourceSet);
}

public static List<String> getCompileClasspathModules(Project project, SourceSet sourceSet) {
return getClasspathModules("getCompileClasspathModules", project, sourceSet);
return getDeclaredModules("getCompileClasspathModules", project, sourceSet);
}

public static List<String> getClasspathModules(String getter, Project project, SourceSet sourceSet) {
public static List<String> getExportsToModules(Project project, SourceSet sourceSet) {
return getDeclaredModules("getExportsToModules", project, sourceSet);
}

public static List<String> getOpensToModules(Project project, SourceSet sourceSet) {
return getDeclaredModules("getOpensToModules", project, sourceSet);
}

private static List<String> getDeclaredModules(String getter, Project project, SourceSet sourceSet) {
Object moduleInfoDslExtension = project.getExtensions().findByName(sourceSet.getName() + "ModuleInfo");
if (moduleInfoDslExtension == null) {
return Collections.emptyList();
Expand Down
8 changes: 8 additions & 0 deletions ...org/gradlex/javamodule/testing/internal/provider/WhiteboxTestRuntimeArgumentProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,18 @@ public void testOpensTo(Provider<List<String>> testOpensTo) {
allTestOpensTo.addAll(testOpensTo);
}

public void testOpensTo(List<String> testOpensTo) {
allTestOpensTo.addAll(testOpensTo);
}

public void testExportsTo(Provider<List<String>> testExportsTo) {
allTestExportsTo.addAll(testExportsTo);
}

public void testExportsTo(List<String> testExportsTo) {
allTestExportsTo.addAll(testExportsTo);
}

@Override
public Iterable<String> asArguments() {
String moduleName = moduleInfoParser.moduleName(mainSourceFolders);
Expand Down