Skip to content

Commit 0d3029d

Browse files
committed
Merge #442 from branch 'fixGradlePropertiesWarnings' of github.com:metafacture/metafacture-core
2 parents 7799c1e + 1ea8c7d commit 0d3029d

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

build.gradle

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ subprojects {
6565

6666
tasks.withType(JavaCompile) {
6767
'all -processing -rawtypes -serial'.split().each {
68-
options.compilerArgs << "-Xlint:${it}"
68+
options.compilerArgs << "-Xlint:${it}".toString()
6969
}
7070

7171
options.compilerArgs << '-Werror'
@@ -139,7 +139,7 @@ gradle.projectsEvaluated {
139139
}
140140

141141
def mavenProjectDescription = {
142-
name project.mavenName ?: project.name
142+
name = project.mavenName ?: project.name
143143
if (project.description) {
144144
description project.description
145145
}
@@ -148,7 +148,7 @@ gradle.projectsEvaluated {
148148
developers {
149149
developer {
150150
id 'mgeipel'
151-
name 'Markus M. Geipel'
151+
name = 'Markus M. Geipel'
152152
email 'm.geipel@dnb.de'
153153
url 'https://github.com/mgeipel'
154154
roles {
@@ -158,7 +158,7 @@ gradle.projectsEvaluated {
158158
}
159159
developer {
160160
id 'cboehme'
161-
name 'Christoph Böhme'
161+
name = 'Christoph Böhme'
162162
email 'c.boehme@dnb.de'
163163
url 'https://github.com/cboehme'
164164
roles {
@@ -168,18 +168,18 @@ gradle.projectsEvaluated {
168168
}
169169
}
170170
organization {
171-
name 'Metafacture'
171+
name = 'Metafacture'
172172
url 'https://github.com/metafacture'
173173
}
174174
licenses {
175175
license {
176-
name 'The Apache License, Version 2.0'
176+
name = 'The Apache License, Version 2.0'
177177
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
178178
}
179179
}
180180
mailingLists {
181181
mailingList {
182-
name 'Metafacture Mailing List'
182+
name = 'Metafacture Mailing List'
183183
post 'metafacture@lists.dnb.de'
184184
subscribe 'metafacture-subscribe@lists.dnb.de'
185185
unsubscribe 'metafacture-unsubscribe@lists.dnb.de'
@@ -286,7 +286,6 @@ class ScmInfo {
286286
}
287287

288288
def getScmInfo() {
289-
def version = null
290289
def tag = getGitTag()
291290
if (tag != null) {
292291
logger.lifecycle('SCM tag found. Making a release build')
@@ -304,11 +303,11 @@ def getSnapshotVersion() {
304303
logger.warn('No Git repository found')
305304
return 'non-scm-build-SNAPSHOT'
306305
}
307-
if (grgit.branch.current().fullName.equals('HEAD')) {
306+
if (grgit.branch.current().fullName == 'HEAD') {
308307
logger.lifecycle('Detached HEAD found')
309308
return "commit-${grgit.head().id}-SNAPSHOT"
310309
}
311-
if (grgit.branch.current().name.equals('master')) {
310+
if (grgit.branch.current().name == 'master') {
312311
logger.lifecycle('On master branch')
313312
return 'master-SNAPSHOT'
314313
}

0 commit comments

Comments
 (0)