From 1a2a5771c22abf7892f7535f211b1c5d186aef89 Mon Sep 17 00:00:00 2001
From: Jean de Klerk <jadekler@gmail.com>
Date: Sun, 20 Sep 2015 18:52:15 -0600
Subject: [PATCH] Quote harmonization in build.gradle

Do not use double quotes for non-interpolated strings.

Closes gh-135
---
 .../resources/templates/starter-build.gradle  | 16 +++++++--------
 .../generator/ProjectGeneratorTests.groovy    | 20 +++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/initializr/src/main/resources/templates/starter-build.gradle b/initializr/src/main/resources/templates/starter-build.gradle
index f87ca596..1742fa4b 100644
--- a/initializr/src/main/resources/templates/starter-build.gradle
+++ b/initializr/src/main/resources/templates/starter-build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
     dependencies {
         classpath("org.springframework.boot:spring-boot-gradle-plugin:\${springBootVersion}") <% if (!bootOneThreeAvailable) { %>
-        classpath("io.spring.gradle:dependency-management-plugin:0.5.2.RELEASE")<% } %>
+        classpath('io.spring.gradle:dependency-management-plugin:0.5.2.RELEASE')<% } %>
     }
 }
 
@@ -39,13 +39,13 @@ repositories {
 }
 <% } %>
 dependencies {<% compileDependencies.each { %>
-    compile("${it.groupId}:${it.artifactId}${it.version ? ":$it.version" : ""}")<% } %><% if (language=='groovy') { %>
-    compile("org.codehaus.groovy:groovy")<% } %><% runtimeDependencies.each { %>
-    runtime("${it.groupId}:${it.artifactId}${it.version ? ":$it.version" : ""}")<% } %><% if (packaging=='war') { %>
-    providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")<% } %><% providedDependencies.each { %>
-    providedRuntime("${it.groupId}:${it.artifactId}${it.version ? ":$it.version" : ""}")<% } %>
-    testCompile("org.springframework.boot:spring-boot-starter-test") <% testDependencies.each { %>
-    testCompile("${it.groupId}:${it.artifactId}${it.version ? ":$it.version" : ""}")<% } %>
+    compile('${it.groupId}:${it.artifactId}${it.version ? ":$it.version" : ""}')<% } %><% if (language=='groovy') { %>
+    compile('org.codehaus.groovy:groovy')<% } %><% runtimeDependencies.each { %>
+    runtime('${it.groupId}:${it.artifactId}${it.version ? ":$it.version" : ""}')<% } %><% if (packaging=='war') { %>
+    providedRuntime('org.springframework.boot:spring-boot-starter-tomcat')<% } %><% providedDependencies.each { %>
+    providedRuntime('${it.groupId}:${it.artifactId}${it.version ? ":$it.version" : ""}')<% } %>
+    testCompile('org.springframework.boot:spring-boot-starter-test') <% testDependencies.each { %>
+    testCompile('${it.groupId}:${it.artifactId}${it.version ? ":$it.version" : ""}')<% } %>
 }
 <% if (boms) { %>
 dependencyManagement {
diff --git a/initializr/src/test/groovy/io/spring/initializr/generator/ProjectGeneratorTests.groovy b/initializr/src/test/groovy/io/spring/initializr/generator/ProjectGeneratorTests.groovy
index 8312c56f..81dc06d7 100644
--- a/initializr/src/test/groovy/io/spring/initializr/generator/ProjectGeneratorTests.groovy
+++ b/initializr/src/test/groovy/io/spring/initializr/generator/ProjectGeneratorTests.groovy
@@ -264,9 +264,9 @@ class ProjectGeneratorTests {
 		projectGenerator.metadata = metadata
 		def request = createProjectRequest('whatever', 'data-jpa', 'web')
 		generateGradleBuild(request)
-				.contains("compile(\"org.springframework.boot:spring-boot-starter-web\")")
-				.contains("compile(\"org.springframework.boot:spring-boot-starter-data-jpa\")")
-				.contains("compile(\"org.acme:whatever:1.2.3\")")
+				.contains("compile('org.springframework.boot:spring-boot-starter-web')")
+				.contains("compile('org.springframework.boot:spring-boot-starter-data-jpa')")
+				.contains("compile('org.acme:whatever:1.2.3')")
 	}
 
 	@Test
@@ -303,11 +303,11 @@ class ProjectGeneratorTests {
 		projectGenerator.metadata = metadata
 		def request = createProjectRequest('hamcrest', 'h2', 'servlet-api', 'data-jpa', 'web')
 		generateGradleBuild(request)
-				.contains("compile(\"org.springframework.boot:spring-boot-starter-web\")")
-				.contains("compile(\"org.springframework.boot:spring-boot-starter-data-jpa\")")
-				.contains("runtime(\"org.h2:h2\")")
-				.contains("providedRuntime(\"javax.servlet:servlet-api\")")
-				.contains("testCompile(\"org.hamcrest:hamcrest\")")
+				.contains("compile('org.springframework.boot:spring-boot-starter-web')")
+				.contains("compile('org.springframework.boot:spring-boot-starter-data-jpa')")
+				.contains("runtime('org.h2:h2')")
+				.contains("providedRuntime('javax.servlet:servlet-api')")
+				.contains("testCompile('org.hamcrest:hamcrest')")
 	}
 
 	@Test
@@ -316,7 +316,7 @@ class ProjectGeneratorTests {
 		request.bootVersion = '1.2.3.RELEASE'
 		generateGradleBuild(request)
 				.contains("springBootVersion = '1.2.3.RELEASE'")
-				.contains('classpath("io.spring.gradle:dependency-management-plugin:0.5.2.RELEASE")')
+				.contains("classpath('io.spring.gradle:dependency-management-plugin:0.5.2.RELEASE')")
 				.contains("apply plugin: 'spring-boot'")
 				.contains("apply plugin: 'io.spring.dependency-management'")
 	}
@@ -328,7 +328,7 @@ class ProjectGeneratorTests {
 		generateGradleBuild(request)
 				.contains("springBootVersion = '1.3.0.BUILD-SNAPSHOT'")
 				.contains("apply plugin: 'spring-boot'")
-				.doesNotContain('classpath("io.spring.gradle:dependency-management-plugin:0.5.2.RELEASE")')
+				.doesNotContain("classpath('io.spring.gradle:dependency-management-plugin:0.5.2.RELEASE')")
 				.doesNotContain("apply plugin: 'io.spring.dependency-management'")
 	}