Update to Gradle 8.10 + Remove commonBuild #478
Conversation
jamesfredley
changed the title
| @@ -217,7 +217,7 @@ class DefaultDateHelperSpec extends Specification { | |||
|
|
|||
| given: | |||
| DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd").withZone(ZoneId.of('UTC')) | |||
| def date = new java.sql.Date(localDate.atStartOfDay(ZoneId.of("UTC")).toInstant().toEpochMilli()) | |||
| def date = new java.sql.Date(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant().toEpochMilli()) | |||
There was a problem hiding this comment.
why did you go from UTC to systemDefault() ?
There was a problem hiding this comment.
The test failed with it as UTC.
There was a problem hiding this comment.
'1941-01-04' != '1941-01-05'
There was a problem hiding this comment.
It would pass when run on any machine in UTC or UTC+X, but fail for any in UTC-X. This change should allow it to pass regardless of system ZoneId.
# Conflicts: # build.gradle
|
Removes the following unused import.
|
|
Agreed and this is after substantial consolidation of what was in the commonBuild which overlapped and conflicted materially. It is much better now that we see it all directly instead of being applied from files on https://raw.githubusercontent.com/grails/grails-common-build/v2.0.3 |
| def ossUser = System.getenv("SONATYPE_USERNAME") ?: project.hasProperty("sonatypeOssUsername") ? project.sonatypeOssUsername : '' | ||
| def ossPass = System.getenv("SONATYPE_PASSWORD") ?: project.hasProperty("sonatypeOssPassword") ? project.sonatypeOssPassword : '' | ||
| def ossStagingProfileId = System.getenv("SONATYPE_STAGING_PROFILE_ID") ?: project.hasProperty("sonatypeOssStagingProfileId") ? project.sonatypeOssStagingProfileId : '' |
There was a problem hiding this comment.
Use project.findProperty('x'):
def ossUser = System.getenv('SONATYPE_USERNAME') ?: project.findProperty('sonatypeOssUsername') ?: ''
def ossPass = System.getenv('SONATYPE_PASSWORD') ?: project.findProperty('sonatypeOssPassword') ?: ''
def ossStagingProfileId = System.getenv('SONATYPE_STAGING_PROFILE_ID') ?: project.findProperty('sonatypeOssStagingProfileId') ?: ''| def u = System.getenv("ARTIFACTORY_USERNAME") ?: subproject.hasProperty("artifactoryPublishUsername") ? subproject.artifactoryPublishUsername : '' | ||
| def p = System.getenv("ARTIFACTORY_PASSWORD") ?: subproject.hasProperty("artifactoryPublishPassword") ? subproject.artifactoryPublishPassword : '' |
There was a problem hiding this comment.
Use project.findProperty('x'):
def u = System.getenv('ARTIFACTORY_USERNAME') ?: project.findProperty('artifactoryPublishUsername') ?: ''
def p = System.getenv('ARTIFACTORY_PASSWORD') ?: project.findProperty('artifactoryPublishPassword') ?: ''| ext."signing.keyId" = project.hasProperty("signing.keyId") ?: System.getenv('SIGNING_KEY') | ||
| ext."signing.secretKeyRingFile" = project.hasProperty("signing.secretKeyRingFile") ?: "${System.properties['user.home']}${File.separator}.gnupg${File.separator}secring.gpg" | ||
| ext."signing.password" = project.hasProperty("signing.password") ?: System.getenv('SIGNING_PASSPHRASE') |
There was a problem hiding this comment.
Actually, this is not going to work as intended.
It should be using project.findProperty('x'):
ext.set('signing.keyId', project.findProperty('signing.keyId') ?: System.getenv('SIGNING_KEY'))
ext.set('signing.secretKeyRingFile', project.findProperty('signing.secretKeyRingFile') ?: "${System.properties['user.home']}${File.separator}.gnupg${File.separator}secring.gpg")
ext.set('signing.password', project.findProperty('signing.password') ?: System.getenv('SIGNING_PASSPHRASE'))
No description provided.