Commit ada6efe3 authored by MozLando's avatar MozLando
Browse files

Merge #4716



4716: Fix snapshots: (publish.gradle) Do not override "timestamp" property. r=Amejia481,JohanLorenzo a=pocmo

This broke our snapshots since `getTimestamp()` overrides the `timestamp` property that our scripts pass in when building snapshots.
Co-authored-by: default avatarSebastian Kaspari <s.kaspari@gmail.com>
parents f137f10c 47517eb8
......@@ -8,7 +8,7 @@ def libVcsUrl = properties.libVcsUrl
def libLicense = properties.libLicense
def libLicenseUrl = properties.libLicenseUrl
def getTimestamp() {
static def getLocalPublicationTimestamp() {
def date = new Date()
return date.format('yyyyMMddHHmmss')
}
......@@ -32,7 +32,7 @@ ext.configurePublish = { groupIdArg, artifactIdArg, descriptionArg ->
artifactId = artifactIdArg
description = descriptionArg
// 'local' is for streamlining local publication workflow.
version = config.componentsVersion + (project.hasProperty('snapshot') ? '-SNAPSHOT' : (project.hasProperty('local') ? '-local' + getTimestamp() : ''))
version = config.componentsVersion + (project.hasProperty('snapshot') ? '-SNAPSHOT' : (project.hasProperty('local') ? '-local' + getLocalPublicationTimestamp() : ''))
licenses {
license {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment