Skip to content

Continue refinements of AddSettingsPluginRepository #7132

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

Merged
timtebeek merged 1 commit into from
Mar 25, 2026
Merged

Continue refinements of AddSettingsPluginRepository #7132

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
25 changes: 22 additions & 3 deletions rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/AddSettingsPluginRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,31 @@ private List<Statement> addPluginManagementRepos(List<Statement> statements, J p
if (mapped != statements) {
return mapped;
}
// No existing pluginManagement found — insert a new block
// No existing pluginManagement found — insert after any leading imports
Statement pluginManagementStatement = pluginManagement instanceof J.Block ?
((J.Block) pluginManagement).getStatements().get(0) :
(J.MethodInvocation) pluginManagement;
List<Statement> result = ListUtils.concat(pluginManagementStatement, statements);
return ListUtils.map(result, (i, s) -> i == 1 ? s.withPrefix(Space.format("\n\n")) : s);

int insertIdx = 0;
for (int i = 0; i < statements.size(); i++) {
if (statements.get(i) instanceof J.Import) {
insertIdx = i + 1;
} else {
break;
}
}

if (insertIdx == 0) {
List<Statement> result = ListUtils.concat(pluginManagementStatement, statements);
return ListUtils.map(result, (i, s) -> i == 1 ? s.withPrefix(Space.format("\n\n")) : s);
} else {
List<Statement> result = ListUtils.insert(statements, pluginManagementStatement.withPrefix(Space.format("\n\n")), insertIdx);
if (insertIdx < result.size() - 1) {
int nextIdx = insertIdx + 1;
result = ListUtils.map(result, (i, s) -> i == nextIdx ? s.withPrefix(Space.format("\n\n")) : s);
}
return result;
}
}

private J.@Nullable MethodInvocation unwrapMethodCall(Statement statement, String methodName) {
Expand Down
56 changes: 21 additions & 35 deletions ...-gradle/src/test/java/org/openrewrite/gradle/plugins/AddSettingsPluginRepositoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,35 +504,6 @@ void skipWhenExistsGradlePluginPortalAloneKts() {
);
}

@Test
void addToExistingPluginManagementNotFirstStatement() {
rewriteRun(
spec -> spec.recipe(new AddSettingsPluginRepository("gradlePluginPortal", null))
.expectedCyclesThatMakeChanges(1).cycles(3),
settingsGradle(
"""
rootProject.name = "demo"

pluginManagement {
repositories {
mavenLocal()
}
}
""",
"""
rootProject.name = "demo"

pluginManagement {
repositories {
mavenLocal()
gradlePluginPortal()
}
}
"""
)
);
}

@Test
void addToExistingPluginManagementNotFirstStatementKts() {
rewriteRun(
Expand Down Expand Up @@ -563,10 +534,10 @@ void addToExistingPluginManagementNotFirstStatementKts() {
}

@Test
void skipWhenExistsPluginManagementNotFirstStatement() {
void skipWhenExistsPluginManagementNotFirstStatementKts() {
rewriteRun(
spec -> spec.recipe(new AddSettingsPluginRepository("gradlePluginPortal", null)),
settingsGradle(
settingsGradleKts(
"""
rootProject.name = "demo"

Expand All @@ -581,18 +552,33 @@ void skipWhenExistsPluginManagementNotFirstStatement() {
}

@Test
void skipWhenExistsPluginManagementNotFirstStatementKts() {
void noPluginManagementBlockWithBuildCacheKts() {
rewriteRun(
spec -> spec.recipe(new AddSettingsPluginRepository("gradlePluginPortal", null)),
spec -> spec.recipe(new AddSettingsPluginRepository("mavenCentral", null)),
settingsGradleKts(
"""
rootProject.name = "demo"
buildCache {
local {
isEnabled = false
}
}

rootProject.name = "demo"
""",
"""
pluginManagement {
repositories {
gradlePluginPortal()
mavenCentral()
}
}

buildCache {
local {
isEnabled = false
}
}

rootProject.name = "demo"
"""
)
);
Expand Down