Skip to content

Commit c046dc2

Browse files
Correct regressions parsing multi-project repos
1 parent 36d17eb commit c046dc2

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

plugin/src/main/java/org/openrewrite/gradle/isolated/DefaultProjectParser.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -645,10 +645,7 @@ public Stream<SourceFile> parse(Project subproject, Set<Path> alreadyParsed, Exe
645645
projectName -> progressBar.intermediateResult(":" + projectName));
646646

647647
Collection<PathMatcher> exclusions = extension.getExclusions().stream()
648-
.map(pattern -> subproject.getProjectDir()
649-
.toPath()
650-
.getFileSystem()
651-
.getPathMatcher("glob:" + pattern))
648+
.map(pattern -> subproject.getProjectDir().toPath().getFileSystem().getPathMatcher("glob:" + pattern))
652649
.collect(toList());
653650
if (isExcluded(exclusions, baseDir.relativize(subproject.getProjectDir().toPath()))) {
654651
logger.lifecycle("Skipping project {} because it is excluded", subproject.getPath());
@@ -682,17 +679,17 @@ public Stream<SourceFile> parse(Project subproject, Set<Path> alreadyParsed, Exe
682679
.toPath());
683680

684681
SourceFileStream projectSourceFileStream;
685-
if (isAndroidProject(project)) {
682+
if (isAndroidProject(subproject)) {
686683
projectSourceFileStream = parseAndroidProjectSourceSets(
687-
project,
684+
subproject,
688685
buildDirPath,
689686
sourceCharset,
690687
alreadyParsed,
691688
exclusions,
692689
ctx);
693690
} else {
694691
projectSourceFileStream = parseGradleProjectSourceSets(
695-
project,
692+
subproject,
696693
buildDirPath,
697694
sourceCharset,
698695
alreadyParsed,

plugin/src/main/kotlin/org/openrewrite/gradle/GradleProjectSpec.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class GradleProjectSpec(
8484
Files.createDirectories(dir.toPath())
8585
val settings = dir.toPath().resolve("settings.gradle")
8686
val lines = ArrayList<String>()
87-
if(settingsGradle == null) {
87+
if (settingsGradle == null) {
8888
lines.add("""
8989
pluginManagement {
9090
repositories {
@@ -111,9 +111,9 @@ class GradleProjectSpec(
111111
}
112112
}
113113
""".trimIndent())
114-
lines.add("rootProject.name = \"${dir.name}\"\n")
114+
lines.add("rootProject.name = \"${dir.name}\"")
115115
if (!subprojects.isEmpty()) {
116-
subprojects.forEach {subproject -> lines.add("include('${subproject.dir.name}')\n")};
116+
subprojects.forEach {subproject -> lines.add("include('${subproject.dir.name}')")};
117117
}
118118
} else {
119119
lines.add(settingsGradle!!)

0 commit comments

Comments
 (0)