Skip to content

Commit bb1b089

Browse files
committed
Install bridge to 'extra-java-module-info' also for non 'java' projects
This is in particular useful for 'java-platform' projects to define constraints by Module Names.
1 parent f0dade1 commit bb1b089

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

src/main/java/de/jjohannes/gradle/moduledependencies/JavaModuleDependenciesExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public Provider<String> ga(String moduleName) {
5959
}
6060

6161
/**
62-
* Converts 'Module Name' and 'Version' to GA coordinates that can be used in
62+
* Converts 'Module Name' and 'Version' to GAV coordinates that can be used in
6363
* dependency declarations as String: "group:name:version"
6464
*
6565
* @param moduleName The Module Name

src/main/java/de/jjohannes/gradle/moduledependencies/JavaModuleDependenciesPlugin.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ public void apply(Project project) {
5252
JavaModuleDependenciesExtension javaModuleDependencies = project.getExtensions().create(
5353
JAVA_MODULE_DEPENDENCIES, JavaModuleDependenciesExtension.class, versionCatalogs);
5454

55+
setupExtraJavaModulePluginBridge(project, javaModuleDependencies);
56+
5557
project.getPlugins().withType(JavaPlugin.class, javaPlugin -> setupForJavaProject(project, javaModuleDependencies));
5658
}
5759

@@ -63,7 +65,6 @@ private void setupForJavaProject(Project project, JavaModuleDependenciesExtensio
6365
process(ModuleInfo.Directive.REQUIRES_TRANSITIVE, sourceSet.getApiConfigurationName(), sourceSet, project, javaModuleDependencies);
6466
process(ModuleInfo.Directive.REQUIRES_STATIC_TRANSITIVE, sourceSet.getCompileOnlyApiConfigurationName(), sourceSet, project, javaModuleDependencies);
6567
});
66-
setupExtraJavaModulePluginBridge(project, javaModuleDependencies);
6768
setupReportTasks(project, javaModuleDependencies);
6869
setupMigrationTasks(project, javaModuleDependencies);
6970
}

src/main/resources/de/jjohannes/gradle/moduledependencies/unique_modules.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2891,6 +2891,7 @@ org.bitbucket.cowwoc.requirements.java=org.bitbucket.cowwoc.requirements:java
28912891
org.bitbucket.cowwoc.requirements.natives=org.bitbucket.cowwoc.requirements:natives
28922892
org.bouncycastle.fips.core=org.bouncycastle:bc-fips-debug
28932893
org.bouncycastle.fips.pkix=org.bouncycastle:bcpkix-fips
2894+
org.bouncycastle.fips.pqc_addon=org.bouncycastle:bcpqc-addon-fips
28942895
org.bouncycastle.fips.tls=org.bouncycastle:bctls-fips
28952896
org.bouncycastle.mail=org.bouncycastle:bcmail-jdk18on
28962897
org.bouncycastle.pg=org.bouncycastle:bcpg-jdk18on

0 commit comments

Comments
 (0)