Merge branch 'develop' of https://github.com/microsoft/vscode-gradle …

…into develop
microsoft · May 23, 2022 · 9391187 · 9391187
2 parents 7d47292 + f43e960
commit 9391187
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/gradle-plugin/src/main/java/com/microsoft/gradle/GradleProjectModelBuilder.java b/gradle-plugin/src/main/java/com/microsoft/gradle/GradleProjectModelBuilder.java
@@ -19,6 +19,7 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 import org.gradle.api.Project;
@@ -90,9 +91,9 @@ private GradleProjectModel buildModel(Project rootProject, Project project) {
 		List<String> plugins = getPlugins(project);
 		List<GradleClosure> closures = getPluginClosures(project);
 		List<GradleProjectModel> subModels = new ArrayList<>();
-		Set<Project> subProjects = project.getSubprojects();
-		for (Project subProject : subProjects) {
-			GradleProjectModel subModel = buildModel(rootProject, subProject);
+		Map<String, Project> childProjects = project.getChildProjects();
+		for (Project childProject : childProjects.values()) {
+			GradleProjectModel subModel = buildModel(rootProject, childProject);
 			if (subModel != null) {
 				subModels.add(subModel);
 			}