diff --git a/CHANGELOG.md b/CHANGELOG.md index 663f0c7..3d1fb4e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Java Module Dependencies Gradle Plugin - Changelog +## Version 1.9.3 +* [#209](https://github.com/gradlex-org/java-module-dependencies/issues/209) Fix: configuration cache issue when building kotlin-dsl plugins + ## Version 1.9.2 * Update module name mappings diff --git a/src/main/java/org/gradlex/javamodule/dependencies/JavaModuleDependenciesExtension.java b/src/main/java/org/gradlex/javamodule/dependencies/JavaModuleDependenciesExtension.java index ecd41e6..03a937b 100644 --- a/src/main/java/org/gradlex/javamodule/dependencies/JavaModuleDependenciesExtension.java +++ b/src/main/java/org/gradlex/javamodule/dependencies/JavaModuleDependenciesExtension.java @@ -132,10 +132,10 @@ public abstract class JavaModuleDependenciesExtension { */ public abstract Property getAnalyseOnly(); - public JavaModuleDependenciesExtension(VersionCatalogsExtension versionCatalogs) { + public JavaModuleDependenciesExtension(VersionCatalogsExtension versionCatalogs, File rootDir) { this.versionCatalogs = versionCatalogs; getModuleInfoCache().convention(getProviders().provider(() -> getObjects().newInstance(ModuleInfoCache.class, false))); - getModulesProperties().set(new File(getProject().getRootDir(), "gradle/modules.properties")); + getModulesProperties().set(new File(rootDir, "gradle/modules.properties")); getVersionCatalogName().convention("libs"); getModuleNameCheck().convention(true); getAnalyseOnly().convention(false); diff --git a/src/main/java/org/gradlex/javamodule/dependencies/JavaModuleDependenciesPlugin.java b/src/main/java/org/gradlex/javamodule/dependencies/JavaModuleDependenciesPlugin.java index c43ec4d..23efb67 100644 --- a/src/main/java/org/gradlex/javamodule/dependencies/JavaModuleDependenciesPlugin.java +++ b/src/main/java/org/gradlex/javamodule/dependencies/JavaModuleDependenciesPlugin.java @@ -85,7 +85,7 @@ public void apply(ExtensionAware projectOrSettings) { private void applyProject(Project project) { VersionCatalogsExtension versionCatalogs = project.getExtensions().findByType(VersionCatalogsExtension.class); JavaModuleDependenciesExtension javaModuleDependencies = project.getExtensions().create( - JAVA_MODULE_DEPENDENCIES, JavaModuleDependenciesExtension.class, versionCatalogs); + JAVA_MODULE_DEPENDENCIES, JavaModuleDependenciesExtension.class, versionCatalogs, project.getRootDir()); setupExtraJavaModulePluginBridge(project, javaModuleDependencies);