Skip to content
This repository was archived by the owner on Apr 5, 2022. It is now read-only.

Commit fe4ae5e

Browse files
committed
Standardize on double-quotes in Gradle files
1 parent 5d80ef6 commit fe4ae5e

File tree

3 files changed

+76
-76
lines changed

3 files changed

+76
-76
lines changed

build.gradle

+56-56
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
buildscript {
22
repositories {
3-
maven { url 'http://repo.springsource.org/plugins-release' }
3+
maven { url "http://repo.springsource.org/plugins-release" }
44
}
55
dependencies {
6-
classpath 'org.springframework.build.gradle:docbook-reference-plugin:0.2.8'
7-
classpath 'me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1'
6+
classpath "org.springframework.build.gradle:docbook-reference-plugin:0.2.8"
7+
classpath "me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1"
88
}
99
}
1010

1111
configure(allprojects) {
12-
group = 'org.springframework.android'
12+
group = "org.springframework.android"
1313

1414
ext.androidVersion = "4.1.1.4"
1515
ext.springSocialVersion = "1.0.2.RELEASE"
@@ -22,10 +22,10 @@ configure(allprojects) {
2222
ext.commonsHttpClientVersion = "3.1"
2323
ext.gradleScriptDir = "${rootProject.projectDir}/gradle"
2424

25-
apply plugin: 'java'
26-
apply plugin: 'eclipse'
27-
apply plugin: 'idea'
28-
apply plugin: 'javadocHotfix'
25+
apply plugin: "java"
26+
apply plugin: "eclipse"
27+
apply plugin: "idea"
28+
apply plugin: "javadocHotfix"
2929

3030
compileJava {
3131
sourceCompatibility=1.5
@@ -66,7 +66,7 @@ configure(allprojects) {
6666
// exported to dependent projects in Eclipse to avoid false compilation errors due
6767
// to changing APIs across these versions
6868
eclipse.classpath.file.whenMerged { classpath ->
69-
classpath.entries.findAll { entry -> entry.path.contains('servlet-api') }*.exported = false
69+
classpath.entries.findAll { entry -> entry.path.contains("servlet-api") }*.exported = false
7070
}
7171
}
7272

@@ -80,14 +80,14 @@ configure(subprojects) { subproject ->
8080
jar {
8181
manifest.attributes["Created-By"] =
8282
"${System.getProperty("java.version")} (${System.getProperty("java.specification.vendor")})"
83-
manifest.attributes['Implementation-Title'] = subproject.name
84-
manifest.attributes['Implementation-Version'] = subproject.version
83+
manifest.attributes["Implementation-Title"] = subproject.name
84+
manifest.attributes["Implementation-Version"] = subproject.version
8585

8686
from("${rootProject.projectDir}/src/dist") {
8787
include "license.txt"
8888
include "notice.txt"
8989
into "META-INF"
90-
expand(copyright: new Date().format('yyyy'), version: project.version)
90+
expand(copyright: new Date().format("yyyy"), version: project.version)
9191
}
9292
}
9393

@@ -100,12 +100,12 @@ configure(subprojects) { subproject ->
100100
}
101101

102102
task sourcesJar(type: Jar, dependsOn:classes) {
103-
classifier = 'sources'
103+
classifier = "sources"
104104
from sourceSets.main.allJava
105105
}
106106

107107
task javadocJar(type: Jar) {
108-
classifier = 'javadoc'
108+
classifier = "javadoc"
109109
from javadoc
110110
}
111111

@@ -115,25 +115,25 @@ configure(subprojects) { subproject ->
115115
}
116116
}
117117

118-
project('spring-android-core') {
118+
project("spring-android-core") {
119119
description = "Spring for Android Core"
120120

121-
ext.mavenTestDir = '../test/spring-android-core-test/pom.xml'
121+
ext.mavenTestDir = "../test/spring-android-core-test/pom.xml"
122122

123123
dependencies {
124124
compile("com.google.android:android:$androidVersion", provided)
125125
}
126126
}
127127

128-
project('spring-android-auth') {
129-
description = 'Spring for Android Auth'
128+
project("spring-android-auth") {
129+
description = "Spring for Android Auth"
130130

131-
ext.mavenTestDir = '../test/spring-android-auth-test/pom.xml'
131+
ext.mavenTestDir = "../test/spring-android-auth-test/pom.xml"
132132

133133
dependencies {
134134
compile("com.google.android:android:$androidVersion", provided)
135-
compile(project(':spring-android-core'))
136-
compile(project(':spring-android-rest-template'))
135+
compile(project(":spring-android-core"))
136+
compile(project(":spring-android-rest-template"))
137137
compile("org.springframework.social:spring-social-core:$springSocialVersion") {
138138
// exclude spring-web in favor of spring-android-rest-template
139139
exclude group: "org.springframework", module: "spring-web"
@@ -144,14 +144,14 @@ project('spring-android-auth') {
144144
}
145145
}
146146

147-
project('spring-android-rest-template') {
148-
description = 'Spring for Android Rest Template'
147+
project("spring-android-rest-template") {
148+
description = "Spring for Android Rest Template"
149149

150-
ext.mavenTestDir = '../test/spring-android-rest-template-test/pom.xml'
150+
ext.mavenTestDir = "../test/spring-android-rest-template-test/pom.xml"
151151

152152
dependencies {
153153
compile("com.google.android:android:$androidVersion", provided)
154-
compile(project(':spring-android-core'))
154+
compile(project(":spring-android-core"))
155155
compile("org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion", optional)
156156
compile("com.fasterxml.jackson.core:jackson-databind:$jackson2Version", optional)
157157
compile("com.google.code.gson:gson:$gsonVersion", optional)
@@ -171,17 +171,17 @@ configure(subprojects) { subproject ->
171171
task testAndroid(type: Exec, dependsOn: install) {
172172
// suppress all console output during testing unless running `gradle --info`
173173
logging.captureStandardOutput(LogLevel.INFO)
174-
commandLine 'mvn', 'clean', 'install', '-f', subproject.ext.mavenTestDir
174+
commandLine "mvn", "clean", "install", "-f", subproject.ext.mavenTestDir
175175
}
176176
}
177177

178178
configure(rootProject) {
179-
description = 'Spring for Android'
179+
description = "Spring for Android"
180180

181-
apply plugin: 'docbook-reference'
181+
apply plugin: "docbook-reference"
182182

183183
reference {
184-
sourceDir = file('src/reference/docbook')
184+
sourceDir = file("src/reference/docbook")
185185
}
186186

187187
// don't publish the default jar for the root project
@@ -192,8 +192,8 @@ configure(rootProject) {
192192
}
193193

194194
task api(type: Javadoc) {
195-
group = 'Documentation'
196-
description = 'Generates aggregated Javadoc API documentation.'
195+
group = "Documentation"
196+
description = "Generates aggregated Javadoc API documentation."
197197
title = "${rootProject.description} ${version} API"
198198

199199
dependsOn {
@@ -204,14 +204,14 @@ configure(rootProject) {
204204
options.memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED
205205
options.author = true
206206
options.header = rootProject.description
207-
options.overview = 'src/api/overview.html'
207+
options.overview = "src/api/overview.html"
208208
options.links(project.ext.javadocLinks)
209209

210210
source subprojects.collect { project ->
211211
project.sourceSets.main.allJava
212212
}
213213

214-
maxMemory = '1024m'
214+
maxMemory = "1024m"
215215
destinationDir = new File(buildDir, "api")
216216

217217
doFirst {
@@ -220,38 +220,38 @@ configure(rootProject) {
220220
}
221221

222222
task docsZip(type: Zip) {
223-
group = 'Distribution'
224-
classifier = 'docs'
223+
group = "Distribution"
224+
classifier = "docs"
225225
description = "Builds -${classifier} archive containing api and reference " +
226226
"for deployment at static.springframework.org/spring-android/docs."
227227

228-
from('src/dist') {
229-
include 'changelog.txt'
228+
from("src/dist") {
229+
include "changelog.txt"
230230
}
231231

232232
from (api) {
233-
into 'api'
233+
into "api"
234234
}
235235

236236
from (reference) {
237-
into 'reference'
237+
into "reference"
238238
}
239239
}
240240

241241
task distZip(type: Zip, dependsOn: docsZip) {
242-
group = 'Distribution'
243-
classifier = 'dist'
242+
group = "Distribution"
243+
classifier = "dist"
244244
description = "Builds -${classifier} archive, containing all jars and docs, " +
245245
"suitable for community download page."
246246

247247
def baseDir = "${project.name}-${project.version}"
248248

249-
from('src/dist') {
250-
include 'readme.txt'
251-
include 'license.txt'
252-
include 'notice.txt'
249+
from("src/dist") {
250+
include "readme.txt"
251+
include "license.txt"
252+
include "notice.txt"
253253
into "${baseDir}"
254-
expand(copyright: new Date().format('yyyy'), version: project.version)
254+
expand(copyright: new Date().format("yyyy"), version: project.version)
255255
}
256256

257257
from(zipTree(docsZip.archivePath)) {
@@ -261,10 +261,10 @@ configure(rootProject) {
261261
subprojects.each { subproject ->
262262
into ("${baseDir}/libs") {
263263
from subproject.jar
264-
if (subproject.tasks.findByPath('sourcesJar')) {
264+
if (subproject.tasks.findByPath("sourcesJar")) {
265265
from subproject.sourcesJar
266266
}
267-
if (subproject.tasks.findByPath('javadocJar')) {
267+
if (subproject.tasks.findByPath("javadocJar")) {
268268
from subproject.javadocJar
269269
}
270270
}
@@ -277,24 +277,24 @@ configure(rootProject) {
277277
}
278278

279279
task wrapper(type: Wrapper) {
280-
gradleVersion = '1.11'
280+
gradleVersion = "1.11"
281281
}
282282
}
283283

284284
task updateRootDocs {
285285
copy {
286-
from 'src/dist'
286+
from "src/dist"
287287
into "${rootProject.projectDir}"
288-
include 'notice.txt'
289-
expand(copyright: new Date().format('yyyy'), version: project.version)
290-
rename { filename -> 'NOTICE' }
288+
include "notice.txt"
289+
expand(copyright: new Date().format("yyyy"), version: project.version)
290+
rename { filename -> "NOTICE" }
291291
}
292292

293293
copy {
294-
from 'src/dist'
294+
from "src/dist"
295295
into "${rootProject.projectDir}"
296-
include 'license.txt'
297-
rename { filename -> 'LICENSE' }
296+
include "license.txt"
297+
rename { filename -> "LICENSE" }
298298
}
299299
}
300300

gradle/publish-maven.gradle

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apply plugin: 'maven'
1+
apply plugin: "maven"
22

33
ext.optionalDeps = []
44
ext.providedDeps = []
@@ -14,45 +14,45 @@ install {
1414

1515
def customizePom(pom, gradleProject) {
1616
pom.whenConfigured { generatedPom ->
17-
// respect 'optional' and 'provided' dependencies
17+
// respect "optional" and "provided" dependencies
1818
gradleProject.optionalDeps.each { dep ->
1919
generatedPom.dependencies.findAll { it.artifactId == dep.name }*.optional = true
2020
}
2121
gradleProject.providedDeps.each { dep ->
22-
generatedPom.dependencies.findAll { it.artifactId == dep.name }*.scope = 'provided'
22+
generatedPom.dependencies.findAll { it.artifactId == dep.name }*.scope = "provided"
2323
}
2424

2525
// eliminate test-scoped dependencies (no need in maven central poms)
2626
generatedPom.dependencies.removeAll { dep ->
27-
dep.scope == 'test'
27+
dep.scope == "test"
2828
}
2929

3030
// add all items necessary for maven central publication
3131
generatedPom.project {
3232
name = gradleProject.description
3333
description = gradleProject.description
34-
url = 'https://github.com/SpringSource/spring-android'
34+
url = "https://github.com/SpringSource/spring-android"
3535
organization {
36-
name = 'SpringSource'
37-
url = 'http://springsource.org/spring-android'
36+
name = "SpringSource"
37+
url = "http://springsource.org/spring-android"
3838
}
3939
licenses {
4040
license {
41-
name 'The Apache Software License, Version 2.0'
42-
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
43-
distribution 'repo'
41+
name "The Apache Software License, Version 2.0"
42+
url "http://www.apache.org/licenses/LICENSE-2.0.txt"
43+
distribution "repo"
4444
}
4545
}
4646
scm {
47-
url = 'https://github.com/SpringSource/spring-android'
48-
connection = 'scm:git:git://github.com/SpringSource/spring-android'
49-
developerConnection = 'scm:git:git://github.com/SpringSource/spring-android'
47+
url = "https://github.com/SpringSource/spring-android"
48+
connection = "scm:git:git://github.com/SpringSource/spring-android"
49+
developerConnection = "scm:git:git://github.com/SpringSource/spring-android"
5050
}
5151
developers {
5252
developer {
53-
id = 'royclarkson'
54-
name = 'Roy Clarkson'
55-
53+
id = "royclarkson"
54+
name = "Roy Clarkson"
55+
5656
}
5757
}
5858
}

settings.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
rootProject.name = 'spring-android'
1+
rootProject.name = "spring-android"
22

3-
include 'spring-android-core'
4-
include 'spring-android-auth'
5-
include 'spring-android-rest-template'
3+
include "spring-android-core"
4+
include "spring-android-auth"
5+
include "spring-android-rest-template"

0 commit comments

Comments
 (0)