Skip to content

Commit

Permalink
Merge #442 from branch 'fixGradlePropertiesWarnings' of github.com:me…
Browse files Browse the repository at this point in the history
…tafacture/metafacture-core
  • Loading branch information
dr0i committed Feb 25, 2022
2 parents 7799c1e + 1ea8c7d commit 0d3029d
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ subprojects {

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

options.compilerArgs << '-Werror'
Expand Down Expand Up @@ -139,7 +139,7 @@ gradle.projectsEvaluated {
}

def mavenProjectDescription = {
name project.mavenName ?: project.name
name = project.mavenName ?: project.name
if (project.description) {
description project.description
}
Expand All @@ -148,7 +148,7 @@ gradle.projectsEvaluated {
developers {
developer {
id 'mgeipel'
name 'Markus M. Geipel'
name = 'Markus M. Geipel'
email '[email protected]'
url 'https://github.com/mgeipel'
roles {
Expand All @@ -158,7 +158,7 @@ gradle.projectsEvaluated {
}
developer {
id 'cboehme'
name 'Christoph Böhme'
name = 'Christoph Böhme'
email '[email protected]'
url 'https://github.com/cboehme'
roles {
Expand All @@ -168,18 +168,18 @@ gradle.projectsEvaluated {
}
}
organization {
name 'Metafacture'
name = 'Metafacture'
url 'https://github.com/metafacture'
}
licenses {
license {
name 'The Apache License, Version 2.0'
name = 'The Apache License, Version 2.0'
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
}
}
mailingLists {
mailingList {
name 'Metafacture Mailing List'
name = 'Metafacture Mailing List'
post '[email protected]'
subscribe '[email protected]'
unsubscribe '[email protected]'
Expand Down Expand Up @@ -286,7 +286,6 @@ class ScmInfo {
}

def getScmInfo() {
def version = null
def tag = getGitTag()
if (tag != null) {
logger.lifecycle('SCM tag found. Making a release build')
Expand All @@ -304,11 +303,11 @@ def getSnapshotVersion() {
logger.warn('No Git repository found')
return 'non-scm-build-SNAPSHOT'
}
if (grgit.branch.current().fullName.equals('HEAD')) {
if (grgit.branch.current().fullName == 'HEAD') {
logger.lifecycle('Detached HEAD found')
return "commit-${grgit.head().id}-SNAPSHOT"
}
if (grgit.branch.current().name.equals('master')) {
if (grgit.branch.current().name == 'master') {
logger.lifecycle('On master branch')
return 'master-SNAPSHOT'
}
Expand Down

0 comments on commit 0d3029d

Please sign in to comment.