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

Make generated .gitignore more multi-module friendly

Browse Source 
Closes gh-927
This commit is contained in:
Andy Wilkinson 2019-06-14 14:31:22 +01:00
parent 2f50cf1c8f
commit 372ff967a1
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/scm/git/GitProjectGenerationConfiguration.java
View File

@ -49,8 +49,9 @@ public class GitProjectGenerationConfiguration {
@ConditionalOnBuildSystem(MavenBuildSystem.ID)
public GitIgnoreCustomizer mavenGitIgnoreCustomizer() {
return (gitIgnore) -> {
gitIgnore.getGeneral().add("/target/", "!.mvn/wrapper/maven-wrapper.jar");
gitIgnore.getNetBeans().add("/build/");
gitIgnore.getGeneral().add("target/", "!.mvn/wrapper/maven-wrapper.jar", "!**/src/main/**",
"!**/src/test/**");
gitIgnore.getNetBeans().add("build/");
};
}
@ -58,8 +59,9 @@ public class GitProjectGenerationConfiguration {
@ConditionalOnBuildSystem(GradleBuildSystem.ID)
public GitIgnoreCustomizer gradleGitIgnoreCustomizer() {
return (gitIgnore) -> {
gitIgnore.getGeneral().add(".gradle", "/build/", "!gradle/wrapper/gradle-wrapper.jar");
gitIgnore.getIntellijIdea().add("/out/");
gitIgnore.getGeneral().add(".gradle", "build/", "!gradle/wrapper/gradle-wrapper.jar", "!**/src/main/**",
"!**/src/test/**");
gitIgnore.getIntellijIdea().add("out/");
};
}

7
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/scm/git/GitProjectGenerationConfigurationTests.java
View File

@ -67,8 +67,8 @@ class GitProjectGenerationConfigurationTests {
ProjectDescription description = new ProjectDescription();
description.setBuildSystem(new GradleBuildSystem());
description.setPlatformVersion(Version.parse("2.1.0.RELEASE"));
assertThat(generateGitIgnore(description))
.contains(".gradle", "/build/", "!gradle/wrapper/gradle-wrapper.jar", "/out/")
assertThat(generateGitIgnore(description)).contains(".gradle", "build/", "!gradle/wrapper/gradle-wrapper.jar",
"out/", "!**/src/main/**", "!**/src/test/**")
.doesNotContain("/target/", "!.mvn/wrapper/maven-wrapper.jar");
}
@ -77,7 +77,8 @@ class GitProjectGenerationConfigurationTests {
ProjectDescription description = new ProjectDescription();
description.setBuildSystem(new MavenBuildSystem());
description.setPlatformVersion(Version.parse("2.1.0.RELEASE"));
assertThat(generateGitIgnore(description)).contains("/target/", "!.mvn/wrapper/maven-wrapper.jar")
assertThat(generateGitIgnore(description))
.contains("target/", "!.mvn/wrapper/maven-wrapper.jar", "!**/src/main/**", "!**/src/test/**")
.doesNotContain(".gradle", "!gradle/wrapper/gradle-wrapper.jar", "/out/");
}