Skip to content

Support for parallel loading of subprojects via Isolated Projects #1716

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

Draft
Copilot wants to merge 3 commits into
base: develop
Choose a base branch
from
Draft

Support for parallel loading of subprojects via Isolated Projects #1716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca6599c
Initial plan
Copilot Sep 29, 2025
419b586
Fix Isolated Projects support by removing cross-project access
Copilot Sep 29, 2025
ac0e5b6
Merge branch 'develop' into copilot/fix-f4425167-46a1-463d-bf51-e48a3…
chagong Sep 30, 2025
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
14 changes: 2 additions & 12 deletions gradle-plugin/src/main/java/com/microsoft/gradle/GradleProjectModelBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,19 +103,9 @@ private GradleProjectModel buildModel(Project project, String rootProjectName, D
GradleDependencyNode node = generateDefaultGradleDependencyNode(project);
List<String> plugins = getPlugins(project);
List<GradleClosure> closures = getPluginClosures(project);
// For isolated projects, sub-models will be built separately via individual buildAll calls
// Each project model is built in isolation, avoiding cross-project access
List<GradleProjectModel> subModels = new ArrayList<>();
for (DefaultGradleProject subDefaultGradleProject : gradleProject.getChildren()) {
// Query sub projects when both gradleProject and project contain them
Map<String, Project> childProjects = project.getChildProjects();
String projectName = subDefaultGradleProject.getName();
if (childProjects.keySet().contains(projectName)) {
GradleProjectModel subModel = buildModel(childProjects.get(projectName), rootProjectName,
subDefaultGradleProject);
if (subModel != null) {
subModels.add(subModel);
}
}
}
List<GradleTask> tasks = getGradleTasks(project, rootProjectName, gradleProject);
return new DefaultGradleProjectModel(project.getParent() == null, project.getProjectDir().getAbsolutePath(),
subModels, tasks, node, plugins, closures, scriptClasspaths);
Expand Down
4 changes: 2 additions & 2 deletions gradle-server/src/main/java/com/github/badsyntax/gradle/utils/PluginUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ public static File getInitScript() {
// handle init script
String pluginJarUnixPath = pluginJarFile.getAbsolutePath().replace("\\", "/");
String initScriptContent = "initscript {\n" + " dependencies {\n" + " classpath files('"
+ pluginJarUnixPath + "')\n" + " }\n" + "}\n" + "\n" + "allprojects {\n"
+ " apply plugin: com.microsoft.gradle.GradlePlugin\n" + "}\n";
+ pluginJarUnixPath + "')\n" + " }\n" + "}\n" + "\n" + "gradle.lifecycle.beforeProject { project ->\n"
+ " project.apply plugin: com.microsoft.gradle.GradlePlugin\n" + "}\n";
byte[] initScriptBytes = initScriptContent.getBytes();
byte[] initScriptDigest = getContentDigest(initScriptBytes);
String initScriptName = bytesToHex(initScriptDigest) + ".gradle";
Expand Down
Loading