Skip to content

Commit ba80cf6

Browse files
authored
Move access to rootDir into plugin apply method (#210)
1 parent f67779c commit ba80cf6

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Java Module Dependencies Gradle Plugin - Changelog
22

3+
## Version 1.9.3
4+
* [#209](https://github.com/gradlex-org/java-module-dependencies/issues/209) Fix: configuration cache issue when building kotlin-dsl plugins
5+
36
## Version 1.9.2
47
* Update module name mappings
58

src/main/java/org/gradlex/javamodule/dependencies/JavaModuleDependenciesExtension.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,10 @@ public abstract class JavaModuleDependenciesExtension {
132132
*/
133133
public abstract Property<Boolean> getAnalyseOnly();
134134

135-
public JavaModuleDependenciesExtension(VersionCatalogsExtension versionCatalogs) {
135+
public JavaModuleDependenciesExtension(VersionCatalogsExtension versionCatalogs, File rootDir) {
136136
this.versionCatalogs = versionCatalogs;
137137
getModuleInfoCache().convention(getProviders().provider(() -> getObjects().newInstance(ModuleInfoCache.class, false)));
138-
getModulesProperties().set(new File(getProject().getRootDir(), "gradle/modules.properties"));
138+
getModulesProperties().set(new File(rootDir, "gradle/modules.properties"));
139139
getVersionCatalogName().convention("libs");
140140
getModuleNameCheck().convention(true);
141141
getAnalyseOnly().convention(false);

src/main/java/org/gradlex/javamodule/dependencies/JavaModuleDependenciesPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public void apply(ExtensionAware projectOrSettings) {
8585
private void applyProject(Project project) {
8686
VersionCatalogsExtension versionCatalogs = project.getExtensions().findByType(VersionCatalogsExtension.class);
8787
JavaModuleDependenciesExtension javaModuleDependencies = project.getExtensions().create(
88-
JAVA_MODULE_DEPENDENCIES, JavaModuleDependenciesExtension.class, versionCatalogs);
88+
JAVA_MODULE_DEPENDENCIES, JavaModuleDependenciesExtension.class, versionCatalogs, project.getRootDir());
8989

9090
setupExtraJavaModulePluginBridge(project, javaModuleDependencies);
9191

0 commit comments

Comments
 (0)