Skip to content

Support Gradle's Isolated Projects feature in EnhancedPluginAdditions#rootProjectDirectory() #30

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

Open
PaintNinja wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −5
Open

Support Gradle's Isolated Projects feature in EnhancedPluginAdditions#rootProjectDirectory() #30

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: 1 addition & 1 deletion gradleutils-shared/src/main/java/net/minecraftforge/gradleutils/shared/EnhancedPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ private DirectoryProperty makeRootProjectDirectory() {
try {
var rootProjectDirectory = this.getObjects().directoryProperty();
if (target instanceof Project project) {
return rootProjectDirectory.value(project.getRootProject().getLayout().getProjectDirectory());
return rootProjectDirectory.value(project.getIsolated().getRootProject().getProjectDirectory());
} else if (target instanceof Settings) {
return rootProjectDirectory.value(this.getBuildLayout().getRootDirectory());
} else {
Expand Down
10 changes: 6 additions & 4 deletions ...s-shared/src/main/java/net/minecraftforge/gradleutils/shared/EnhancedPluginAdditions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,12 @@ public sealed interface EnhancedPluginAdditions permits EnhancedPlugin, Enhanced

/// Gets the root project directory to be used for this plugin.
///
/// This directory is either the [org.gradle.api.file.ProjectLayout#getProjectDirectory()] of
/// [org.gradle.api.Project#getRootProject()] or the [org.gradle.api.file.BuildLayout#getRootDirectory()] of the
/// [org.gradle.api.initialization.Settings]. Attempting to call this when the plugin target is neither type will
/// throw an exception.
/// This directory is either the root project's [org.gradle.api.project.IsolatedProject#getProjectDirectory()]
/// (via [org.gradle.api.Project#getIsolated()]) or the [org.gradle.api.file.BuildLayout#getRootDirectory()] of the
/// [org.gradle.api.initialization.Settings]. The isolated view is used instead of
/// [org.gradle.api.Project#getRootProject()] so this remains compatible with Isolated Projects without treating the
/// settings directory as the root project directory. Attempting to call this when the plugin target is neither type
/// will throw an exception.
///
/// @return The root project directory
/// @throws RuntimeException If this plugin cannot access the root project directory (i.e. the target is not
Expand Down