lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-07-15 14:04:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove surrounding brackets for gradle dependencies

Browse Source 
Closes gh-797
This commit is contained in:
Madhura Bhave 2019-01-08 15:30:48 -08:00 committed by Stephane Nicoll
parent b17da2489c
commit 395567ca1d
19 changed files with 91 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,30 +82,30 @@ ext {
dependencies {
{{#compileDependencies}}
implementation('{{groupId}}:{{artifactId}}{{#version}}:{{version}}{{/version}}{{#type}}@{{type}}{{/type}}')
implementation '{{groupId}}:{{artifactId}}{{#version}}:{{version}}{{/version}}{{#type}}@{{type}}{{/type}}'
{{/compileDependencies}}
{{#groovy}}
implementation('org.codehaus.groovy:groovy')
implementation 'org.codehaus.groovy:groovy'
{{/groovy}}
{{#kotlin}}
implementation("org.jetbrains.kotlin:{{kotlinStdlibArtifactId}}{{^kotlinSupport}}:${kotlinVersion}{{/kotlinSupport}}")
implementation("org.jetbrains.kotlin:kotlin-reflect{{^kotlinSupport}}:${kotlinVersion}{{/kotlinSupport}}")
implementation "org.jetbrains.kotlin:{{kotlinStdlibArtifactId}}{{^kotlinSupport}}:${kotlinVersion}{{/kotlinSupport}}"
implementation "org.jetbrains.kotlin:kotlin-reflect{{^kotlinSupport}}:${kotlinVersion}{{/kotlinSupport}}"
{{/kotlin}}
{{#runtimeDependencies}}
runtimeOnly('{{groupId}}:{{artifactId}}{{#version}}:{{version}}{{/version}}{{#type}}@{{type}}{{/type}}')
runtimeOnly '{{groupId}}:{{artifactId}}{{#version}}:{{version}}{{/version}}{{#type}}@{{type}}{{/type}}'
{{/runtimeDependencies}}
{{#compileOnlyDependencies}}
compileOnly('{{groupId}}:{{artifactId}}{{#version}}:{{version}}{{/version}}{{#type}}@{{type}}{{/type}}')
compileOnly '{{groupId}}:{{artifactId}}{{#version}}:{{version}}{{/version}}{{#type}}@{{type}}{{/type}}'
{{/compileOnlyDependencies}}
{{#annotationProcessorDependencies}}
annotationProcessor('{{groupId}}:{{artifactId}}{{#version}}:{{version}}{{/version}}{{#type}}@{{type}}{{/type}}')
annotationProcessor '{{groupId}}:{{artifactId}}{{#version}}:{{version}}{{/version}}{{#type}}@{{type}}{{/type}}'
{{/annotationProcessorDependencies}}
{{#providedDependencies}}
providedRuntime('{{groupId}}:{{artifactId}}{{#version}}:{{version}}{{/version}}{{#type}}@{{type}}{{/type}}')
providedRuntime '{{groupId}}:{{artifactId}}{{#version}}:{{version}}{{/version}}{{#type}}@{{type}}{{/type}}'
{{/providedDependencies}}
testImplementation('org.springframework.boot:spring-boot-starter-test')
testImplementation 'org.springframework.boot:spring-boot-starter-test'
{{#testDependencies}}
testImplementation('{{groupId}}:{{artifactId}}{{#version}}:{{version}}{{/version}}{{#type}}@{{type}}{{/type}}')
testImplementation '{{groupId}}:{{artifactId}}{{#version}}:{{version}}{{/version}}{{#type}}@{{type}}{{/type}}'
{{/testDependencies}}
}
{{#hasBoms}}

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

@ -78,9 +78,9 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests {
request.setType("gradle-build");
ProjectAssert gradleProject = generateProject(request).isGradleProject();
gradleProject.gradleBuildAssert().contains(
"implementation('org.springframework.boot:spring-boot-starter-web')")
"implementation 'org.springframework.boot:spring-boot-starter-web'")
.contains(
"testImplementation('org.springframework.boot:spring-boot-starter-test')");
"testImplementation 'org.springframework.boot:spring-boot-starter-test'");
gradleProject.gradleSettingsAssert().hasProjectName("demo");
verifyProjectSuccessfulEventFor(request);
}
@ -125,7 +125,7 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests {
ProjectRequest request = createProjectRequest("custom-artifact");
generateGradleBuild(request)
.contains("implementation('org.foo:custom-artifact@tar.gz')");
.contains("implementation 'org.foo:custom-artifact@tar.gz'");
}
@Test
@ -214,14 +214,14 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests {
generateProject(request).isJavaWarProject().isGradleProject().gradleBuildAssert()
// This is tagged as web facet so it brings the web one
.contains("apply plugin: 'war'")
.contains("implementation('org.foo:thymeleaf')")
.contains("implementation 'org.foo:thymeleaf'")
.doesNotContain(
"implementation('org.springframework.boot:spring-boot-starter-web')")
"implementation 'org.springframework.boot:spring-boot-starter-web'")
.contains(
"testImplementation('org.springframework.boot:spring-boot-starter-test')")
"testImplementation 'org.springframework.boot:spring-boot-starter-test'")
.contains("configurations {") // declare providedRuntime config
.contains("providedRuntime").contains(
"providedRuntime('org.springframework.boot:spring-boot-starter-tomcat')");
"providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'");
}
@Test
@ -229,15 +229,15 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests {
ProjectRequest request = createProjectRequest("data-jpa");
request.setPackaging("war");
generateGradleBuild(request).contains(
"implementation('org.springframework.boot:spring-boot-starter-data-jpa')")
"implementation 'org.springframework.boot:spring-boot-starter-data-jpa'")
// Added by warpackaging
.contains(
"implementation('org.springframework.boot:spring-boot-starter-web')")
"implementation 'org.springframework.boot:spring-boot-starter-web'")
.contains(
"testImplementation('org.springframework.boot:spring-boot-starter-test')")
"testImplementation 'org.springframework.boot:spring-boot-starter-test'")
.contains("configurations {") // declare providedRuntime config
.contains("providedRuntime").contains(
"providedRuntime('org.springframework.boot:spring-boot-starter-tomcat')");
"providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'");
}
@Test
@ -448,10 +448,10 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests {
applyMetadata(metadata);
ProjectRequest request = createProjectRequest("whatever", "data-jpa", "web");
generateGradleBuild(request).contains(
"implementation('org.springframework.boot:spring-boot-starter-web')")
"implementation 'org.springframework.boot:spring-boot-starter-web'")
.contains(
"implementation('org.springframework.boot:spring-boot-starter-data-jpa')")
.contains("implementation('org.acme:whatever:1.2.3')");
"implementation 'org.springframework.boot:spring-boot-starter-data-jpa'")
.contains("implementation 'org.acme:whatever:1.2.3'");
}
@Test
@ -494,14 +494,14 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests {
ProjectRequest request = createProjectRequest("hamcrest", "h2", "servlet-api",
"data-jpa", "web");
generateGradleBuild(request).contains(
"implementation('org.springframework.boot:spring-boot-starter-web')")
"implementation 'org.springframework.boot:spring-boot-starter-web'")
.contains(
"implementation('org.springframework.boot:spring-boot-starter-data-jpa')")
"implementation 'org.springframework.boot:spring-boot-starter-data-jpa'")
// declare providedRuntime config
.contains("runtimeOnly('org.h2:h2')").contains("configurations {")
.contains("runtimeOnly 'org.h2:h2'").contains("configurations {")
.contains("providedRuntime")
.contains("providedRuntime('javax.servlet:servlet-api')")
.contains("testImplementation('org.hamcrest:hamcrest')");
.contains("providedRuntime 'javax.servlet:servlet-api'")
.contains("testImplementation 'org.hamcrest:hamcrest'");
}
@Test
@ -512,9 +512,9 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests {
.contains("springBootVersion = '1.5.20.BUILD-SNAPSHOT'")
.contains("apply plugin: 'org.springframework.boot'")
.contains(
"implementation('org.springframework.boot:spring-boot-starter-web')")
"implementation 'org.springframework.boot:spring-boot-starter-web'")
.contains(
"testImplementation('org.springframework.boot:spring-boot-starter-test')")
"testImplementation 'org.springframework.boot:spring-boot-starter-test'")
.doesNotContain("apply plugin: 'spring-boot'");
}
@ -522,14 +522,13 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests {
public void gradleBuildWithSpringBoot20() {
ProjectRequest request = createProjectRequest("web");
request.setBootVersion("2.0.0.RELEASE");
generateGradleBuild(request).contains("springBootVersion = '2.0.0.RELEASE'")
.contains("apply plugin: 'org.springframework.boot'")
generateGradleBuild(request).contains("apply plugin: 'org.springframework.boot'")
.doesNotContain("apply plugin: 'spring-boot'")
.contains("apply plugin: 'io.spring.dependency-management'")
.contains(
"implementation('org.springframework.boot:spring-boot-starter-web')")
"implementation 'org.springframework.boot:spring-boot-starter-web'")
.contains(
"testImplementation('org.springframework.boot:spring-boot-starter-test')");
"testImplementation 'org.springframework.boot:spring-boot-starter-test'");
}
@Test
@ -779,10 +778,10 @@ public class ProjectGeneratorTests extends AbstractProjectGeneratorTests {
applyMetadata(metadata);
ProjectRequest request = createProjectRequest("one", "web", "two", "data-jpa");
assertThat(generateGradleBuild(request).getGradleBuild()).containsSubsequence(
"implementation('org.springframework.boot:spring-boot-starter-data-jpa')",
"implementation('org.springframework.boot:spring-boot-starter-web')",
"implementation('com.example:second:1.2.3')",
"implementation('org.acme:first:1.2.3')");
"implementation 'org.springframework.boot:spring-boot-starter-data-jpa'",
"implementation 'org.springframework.boot:spring-boot-starter-web'",
"implementation 'com.example:second:1.2.3'",
"implementation 'org.acme:first:1.2.3'");
}
@Test

8
initializr-generator/src/test/resources/project/gradle/annotation-processor-dependency-build.gradle.gen
View File

@ -25,8 +25,8 @@ repositories {
dependencies {
implementation('org.springframework.boot:spring-boot-starter-data-jpa')
implementation('org.springframework.boot:spring-boot-starter-web')
annotationProcessor('org.springframework.boot:spring-boot-configuration-processor')
testImplementation('org.springframework.boot:spring-boot-starter-test')
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-web'
annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}

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

@ -25,8 +25,8 @@ repositories {
dependencies {
implementation('org.acme:foo')
testImplementation('org.springframework.boot:spring-boot-starter-test')
implementation 'org.acme:foo'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}
dependencyManagement {

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

@ -28,8 +28,8 @@ ext {
}
dependencies {
implementation('org.acme:foo')
testImplementation('org.springframework.boot:spring-boot-starter-test')
implementation 'org.acme:foo'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}
dependencyManagement {

8
initializr-generator/src/test/resources/project/gradle/compile-only-dependency-build.gradle.gen
View File

@ -25,8 +25,8 @@ repositories {
dependencies {
implementation('org.springframework.boot:spring-boot-starter-data-jpa')
implementation('org.springframework.boot:spring-boot-starter-web')
compileOnly('org.acme:foo')
testImplementation('org.springframework.boot:spring-boot-starter-test')
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-web'
compileOnly 'org.acme:foo'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}

8
initializr-generator/src/test/resources/project/gradle/kotlin-java11-build.gradle.gen
View File

@ -41,8 +41,8 @@ repositories {
dependencies {
implementation('org.springframework.boot:spring-boot-starter')
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
implementation("org.jetbrains.kotlin:kotlin-reflect")
testImplementation('org.springframework.boot:spring-boot-starter-test')
implementation 'org.springframework.boot:spring-boot-starter'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
implementation "org.jetbrains.kotlin:kotlin-reflect"
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}

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

@ -27,7 +27,7 @@ repositories {
dependencies {
implementation('org.acme:bar')
implementation('org.acme:foo')
testImplementation('org.springframework.boot:spring-boot-starter-test')
implementation 'org.acme:bar'
implementation 'org.acme:foo'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}

4
initializr-generator/src/test/resources/project/gradle/repositories-milestone-build.gradle.gen
View File

@ -29,6 +29,6 @@ repositories {
dependencies {
implementation('org.acme:foo')
testImplementation('org.springframework.boot:spring-boot-starter-test')
implementation 'org.acme:foo'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}

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

@ -29,6 +29,6 @@ ext {
}
dependencies {
implementation('org.springframework.boot:spring-boot-starter-web')
testImplementation('org.springframework.boot:spring-boot-starter-test')
implementation 'org.springframework.boot:spring-boot-starter-web'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}

6
initializr-generator/src/test/resources/project/groovy/previous/build.gradle.gen
View File

@ -24,7 +24,7 @@ repositories {
dependencies {
implementation('org.springframework.boot:spring-boot-starter')
implementation('org.codehaus.groovy:groovy')
testImplementation('org.springframework.boot:spring-boot-starter-test')
implementation 'org.springframework.boot:spring-boot-starter'
implementation 'org.codehaus.groovy:groovy'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}

6
initializr-generator/src/test/resources/project/groovy/standard/build.gradle.gen
View File

@ -25,7 +25,7 @@ repositories {
dependencies {
implementation('org.springframework.boot:spring-boot-starter')
implementation('org.codehaus.groovy:groovy')
testImplementation('org.springframework.boot:spring-boot-starter-test')
implementation 'org.springframework.boot:spring-boot-starter'
implementation 'org.codehaus.groovy:groovy'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}

8
initializr-generator/src/test/resources/project/groovy/standard/war-build.gradle.gen
View File

@ -29,8 +29,8 @@ configurations {
}
dependencies {
implementation('org.springframework.boot:spring-boot-starter-web')
implementation('org.codehaus.groovy:groovy')
providedRuntime('org.springframework.boot:spring-boot-starter-tomcat')
testImplementation('org.springframework.boot:spring-boot-starter-test')
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.codehaus.groovy:groovy'
providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}

4
initializr-generator/src/test/resources/project/java/previous/build.gradle.gen
View File

@ -24,6 +24,6 @@ repositories {
dependencies {
implementation('org.springframework.boot:spring-boot-starter')
testImplementation('org.springframework.boot:spring-boot-starter-test')
implementation 'org.springframework.boot:spring-boot-starter'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}

4
initializr-generator/src/test/resources/project/java/standard/build.gradle.gen
View File

@ -25,6 +25,6 @@ repositories {
dependencies {
implementation('org.springframework.boot:spring-boot-starter')
testImplementation('org.springframework.boot:spring-boot-starter-test')
implementation 'org.springframework.boot:spring-boot-starter'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}

6
initializr-generator/src/test/resources/project/java/standard/war-build.gradle.gen
View File

@ -29,7 +29,7 @@ configurations {
}
dependencies {
implementation('org.springframework.boot:spring-boot-starter-web')
providedRuntime('org.springframework.boot:spring-boot-starter-tomcat')
testImplementation('org.springframework.boot:spring-boot-starter-test')
implementation 'org.springframework.boot:spring-boot-starter-web'
providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}

8
initializr-generator/src/test/resources/project/kotlin/previous/build.gradle.gen
View File

@ -40,8 +40,8 @@ repositories {
dependencies {
implementation('org.springframework.boot:spring-boot-starter')
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlinVersion}")
implementation("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
testImplementation('org.springframework.boot:spring-boot-starter-test')
implementation 'org.springframework.boot:spring-boot-starter'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlinVersion}"
implementation "org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}"
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}

8
initializr-generator/src/test/resources/project/kotlin/standard/build.gradle.gen
View File

@ -41,8 +41,8 @@ repositories {
dependencies {
implementation('org.springframework.boot:spring-boot-starter')
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
implementation("org.jetbrains.kotlin:kotlin-reflect")
testImplementation('org.springframework.boot:spring-boot-starter-test')
implementation 'org.springframework.boot:spring-boot-starter'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
implementation "org.jetbrains.kotlin:kotlin-reflect"
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}

10
initializr-generator/src/test/resources/project/kotlin/standard/war-build.gradle.gen
View File

@ -45,9 +45,9 @@ configurations {
}
dependencies {
implementation('org.springframework.boot:spring-boot-starter-web')
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
implementation("org.jetbrains.kotlin:kotlin-reflect")
providedRuntime('org.springframework.boot:spring-boot-starter-tomcat')
testImplementation('org.springframework.boot:spring-boot-starter-test')
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
implementation "org.jetbrains.kotlin:kotlin-reflect"
providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}