lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-12-17 17:41:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #880 from roussi

Browse Source 
* pr/880:
  Polish "Write Gradle plugin repositories section only if necessary"
  Write Gradle plugin repositories section only if necessary

Closes gh-880
This commit is contained in:
Stephane Nicoll
2019-07-25 11:39:28 +02:00
parent 18b537b65f 7b18b15a5a
commit e0dfac1a77
4 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/SettingsGradleProjectContributorTests.java
View File

@@ -70,8 +70,7 @@ class SettingsGradleProjectContributorTests {
build.repositories().add("maven-central");
List<String> lines = generateSettings(
groovyDslSettingsGradleProjectContributor(build, IndentingWriterFactory.withDefaultSettings()));
assertThat(lines).containsSequence("pluginManagement {", " repositories {", " gradlePluginPortal()",
" }", "}");
assertThat(lines).doesNotContain("pluginManagement");
}
@Test
@@ -101,8 +100,7 @@ class SettingsGradleProjectContributorTests {
build.repositories().add("maven-central");
List<String> lines = generateSettings(
kotlinDslSettingsGradleProjectContributor(build, IndentingWriterFactory.withDefaultSettings()));
assertThat(lines).containsSequence("pluginManagement {", " repositories {", " gradlePluginPortal()",
" }", "}");
assertThat(lines).doesNotContain("pluginManagement");
}
private List<String> generateSettings(SettingsGradleProjectContributor contributor) throws IOException {

3
initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GradleSettingsWriter.java
View File

@@ -37,6 +37,9 @@ public abstract class GradleSettingsWriter {
}
private void writePluginManagement(IndentingWriter writer, GradleBuild build) {
if (build.pluginRepositories().isEmpty()) {
return;
}
writer.println("pluginManagement {");
writer.indented(() -> {
writeRepositories(writer, build);

7
initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GroovyDslGradleSettingsWriterTests.java
View File

@@ -43,6 +43,13 @@ class GroovyDslGradleSettingsWriterTests {
" gradlePluginPortal()", " }", "}");
}
@Test
void gradleBuildWithoutPluginRepository() throws IOException {
GradleBuild build = new GradleBuild();
List<String> lines = generateSettings(build);
assertThat(lines).doesNotContain("pluginManagement");
}
@Test
void gradleBuildWithPluginRepository() throws IOException {
GradleBuild build = new GradleBuild();

7
initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleSettingsWriterTests.java
View File

@@ -42,6 +42,13 @@ class KotlinDslGradleSettingsWriterTests {
" gradlePluginPortal()", " }", "}");
}
@Test
void gradleBuildWithoutPluginRepository() throws IOException {
GradleBuild build = new GradleBuild();
List<String> lines = generateSettings(build);
assertThat(lines).doesNotContain("pluginManagement");
}
@Test
void gradleBuildWithPluginRepository() throws IOException {
GradleBuild build = new GradleBuild();