lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-09-19 18:22:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Group build properties under ext

Browse Source 
Closes gh-781
This commit is contained in:
Madhura Bhave
2019-01-07 12:08:57 -08:00
parent e23132747b
commit 3982ceceeb
5 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
initializr-generator/src/main/java/io/spring/initializr/generator/ProjectGenerator.java
View File

@@ -420,6 +420,9 @@ public class ProjectGenerator {
model.put("buildPropertiesVersions", versions.entrySet()); model.put("buildPropertiesVersions", versions.entrySet());
request.getBuildProperties().getVersions().forEach( request.getBuildProperties().getVersions().forEach(
(k, v) -> versions.put(computeVersionProperty(request, k), v.get())); (k, v) -> versions.put(computeVersionProperty(request, k), v.get()));
if (!versions.isEmpty()) {
model.put("hasBuildPropertiesVersions", true);
}
Map<String, String> gradle = new LinkedHashMap<>(); Map<String, String> gradle = new LinkedHashMap<>();
model.put("buildPropertiesGradle", gradle.entrySet()); model.put("buildPropertiesGradle", gradle.entrySet());
request.getBuildProperties().getGradle() request.getBuildProperties().getGradle()

6
initializr-generator/src/main/resources/templates/starter-build.gradle
View File

@@ -72,9 +72,13 @@ configurations {
providedRuntime providedRuntime
} }
{{/providedDependencies}} {{/providedDependencies}}
{{#hasBuildPropertiesVersions}}
ext {
{{#buildPropertiesVersions}} {{#buildPropertiesVersions}}
ext['{{key}}'] = '{{value}}' set('{{key}}', '{{value}}')
{{/buildPropertiesVersions}} {{/buildPropertiesVersions}}
}
{{/hasBuildPropertiesVersions}}
dependencies { dependencies {
{{#compileDependencies}} {{#compileDependencies}}

4
initializr-generator/src/test/java/io/spring/initializr/generator/ProjectGeneratorTests.java
View File

@@ -718,8 +718,8 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests {
request.getBuildProperties().getMaven().put("ignore.property", () -> "yes"); request.getBuildProperties().getMaven().put("ignore.property", () -> "yes");
generateGradleBuild(request).contains("name = 'test'") generateGradleBuild(request).contains("name = 'test'")
.contains("ext['foo.version'] = '1.2.3'") .contains("set('foo.version', '1.2.3')")
.contains("ext['internalVersion'] = '4.5.6'") .contains("set('internalVersion', '4.5.6')")
.doesNotContain("ignore.property"); .doesNotContain("ignore.property");
} }

4
initializr-generator/src/test/resources/project/gradle/bom-property-build.gradle.gen
View File

@@ -23,7 +23,9 @@ repositories {
mavenCentral() mavenCentral()
} }
ext['fooVersion'] = '1.3.3' ext {
set('fooVersion', '1.3.3')
}
dependencies { dependencies {
implementation('org.acme:foo') implementation('org.acme:foo')

6
initializr-generator/src/test/resources/project/gradle/version-override-build.gradle.gen
View File

@@ -23,8 +23,10 @@ repositories {
mavenCentral() mavenCentral()
} }
ext['springBarVersion'] = '0.2.0.RELEASE' ext {
ext['spring-foo.version'] = '0.1.0.RELEASE' set('springBarVersion', '0.2.0.RELEASE')
set('spring-foo.version', '0.1.0.RELEASE')
}
dependencies { dependencies {
implementation('org.springframework.boot:spring-boot-starter-web') implementation('org.springframework.boot:spring-boot-starter-web')