Skip to content

Bug: Incorrect plugin insertion order in settings.gradle with pluginManagement and buildscript #6478

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 7 commits into from
Jan 5, 2026
Merged

Bug: Incorrect plugin insertion order in settings.gradle with pluginManagement and buildscript #6478

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b6673cb
Add tests for adding plugins with plugin management and buildscript b…
div-bargali Jan 3, 2026
f13a448
Refactor assertions in version interpolation methods to enhance reada…
div-bargali Jan 5, 2026
fba4c2f
Enhance AddPluginVisitor to correctly insert plugins block after buil…
div-bargali Jan 5, 2026
baf7c97
Update rewrite-gradle/src/main/java/org/openrewrite/gradle/plugins/Ad…
div-bargali Jan 5, 2026
7b1524a
Apply suggestions from code review
timtebeek Jan 5, 2026
4a1319f
Apply formatter
timtebeek Jan 5, 2026
c1370ae
Remove needless `interpolateResolvedVersion` as 3.11.x sees no more r…
timtebeek Jan 5, 2026
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
101 changes: 101 additions & 0 deletions rewrite-gradle/src/test/java/org/openrewrite/gradle/plugins/AddSettingsPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import org.intellij.lang.annotations.Language;
import org.junit.jupiter.api.Test;
import org.openrewrite.groovy.tree.G;
import org.openrewrite.kotlin.tree.K;
import org.openrewrite.test.RecipeSpec;
import org.openrewrite.test.RewriteTest;
import org.openrewrite.test.SourceSpec;
Expand All @@ -28,6 +29,7 @@

import static org.assertj.core.api.Assertions.assertThat;
import static org.openrewrite.gradle.Assertions.settingsGradle;
import static org.openrewrite.gradle.Assertions.settingsGradleKts;
import static org.openrewrite.gradle.toolingapi.Assertions.withToolingApi;

class AddSettingsPluginTest implements RewriteTest {
Expand Down Expand Up @@ -146,6 +148,96 @@ void addPluginApplyFalse() {
);
}

@Test
void addPluginWithPluginManagementAndBuildscriptBlocks() {
rewriteRun(
settingsGradle(
"""
pluginManagement {
repositories {
gradlePluginPortal()
}
}

buildscript {
repositories {
mavenCentral()
}
}

rootProject.name = 'my-project'
""",
interpolateResolvedVersion(
"""
pluginManagement {
repositories {
gradlePluginPortal()
}
}

buildscript {
repositories {
mavenCentral()
}
}

plugins {
id 'com.gradle.enterprise' version '%s'
}

rootProject.name = 'my-project'
"""
)
)
);
}

@Test
void addPluginWithPluginManagementAndBuildscriptBlocksKotlin() {
rewriteRun(
spec -> spec.beforeRecipe(withToolingApi())
.recipe(new AddSettingsPlugin("com.gradle.enterprise", "3.11.x", null, null, null)),
settingsGradleKts(
"""
pluginManagement {
repositories {
gradlePluginPortal()
}
}

buildscript {
repositories {
mavenCentral()
}
}

rootProject.name = "my-project"
""",
interpolateResolvedVersionKotlin(
"""
pluginManagement {
repositories {
gradlePluginPortal()
}
}

buildscript {
repositories {
mavenCentral()
}
}

plugins {
id("com.gradle.enterprise") version "%s"
}

rootProject.name = "my-project"
"""
)
)
);
}

private static Consumer<SourceSpec<G.CompilationUnit>> interpolateResolvedVersion(@Language("groovy") String after) {
return spec -> spec.after(actual -> {
assertThat(actual).isNotNull();
Expand All @@ -154,4 +246,13 @@ private static Consumer<SourceSpec<G.CompilationUnit>> interpolateResolvedVersio
return after.formatted(version.group(0));
});
}

private static Consumer<SourceSpec<K.CompilationUnit>> interpolateResolvedVersionKotlin(@Language("kotlin") String after) {
return spec -> spec.after(actual -> {
assertThat(actual).isNotNull();
Matcher version = Pattern.compile("3\\.\\d+(\\.\\d+)?").matcher(actual);
assertThat(version.find()).isTrue();
return after.formatted(version.group(0));
});
}
}
Loading