matrei commented on code in PR #32:
URL: https://github.com/apache/grails-wrapper/pull/32#discussion_r2051579311
##########
.github/workflows/release.yml:
##########
@@ -37,9 +37,7 @@ jobs:
id: publish
if: success()
env:
- GRADLE_ENTERPRISE_ACCESS_KEY: ${{
secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
- GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{
secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
- GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{
secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
+ develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
Review Comment:
See previous comment.
##########
build.gradle:
##########
@@ -1,10 +1,19 @@
buildscript {
+ ext {
+ grailsVersion = project.grailsVersion
+ }
repositories {
mavenCentral()
+ maven { url "https://repository.apache.org/content/groups/snapshots/"; }
+ maven { url "https://repo.grails.org/grails/core"; }
maven { url "https://plugins.gradle.org/m2/"; }
}
dependencies {
+ classpath platform("org.apache.grails:grails-bom:$grailsVersion")
+ classpath "org.apache.grails:grails-gradle-plugins"
+ classpath "io.spring.gradle:dependency-management-plugin"
classpath
"io.github.gradle-nexus:publish-plugin:$nexusPublishPluginVersion"
+ classpath "com.bmuschko:gradle-nexus-plugin:$gradleNexusPluginVersion"
Review Comment:
Is this necessary?
##########
build.gradle:
##########
@@ -35,6 +44,8 @@ if (isReleaseVersion) {
}
allprojects {
+ group 'org.apache.grails'
+ version project.projectVersion
Review Comment:
Use setter syntax?
Remove project reference?
##########
.github/workflows/gradle.yml:
##########
@@ -17,6 +17,7 @@ jobs:
env:
WORKSPACE: ${{ github.workspace }}
GRADLE_OPTS: -Xmx1500m -Dfile.encoding=UTF-8
+ develocity-access-key: ${{ secrets.GRAILS_DEVELOCITY_ACCESS_KEY }}
Review Comment:
Is this the right place for `develocity-acccess-key`. I think we should add
a `setup-gradle` step.
##########
build.gradle:
##########
@@ -1,10 +1,19 @@
buildscript {
+ ext {
+ grailsVersion = project.grailsVersion
+ }
repositories {
mavenCentral()
+ maven { url "https://repository.apache.org/content/groups/snapshots/"; }
+ maven { url "https://repo.grails.org/grails/core"; }
maven { url "https://plugins.gradle.org/m2/"; }
}
dependencies {
+ classpath platform("org.apache.grails:grails-bom:$grailsVersion")
+ classpath "org.apache.grails:grails-gradle-plugins"
+ classpath "io.spring.gradle:dependency-management-plugin"
classpath
"io.github.gradle-nexus:publish-plugin:$nexusPublishPluginVersion"
Review Comment:
Is this version in the `grails-gradle-bom`?
##########
build.gradle:
##########
@@ -1,10 +1,19 @@
buildscript {
+ ext {
+ grailsVersion = project.grailsVersion
+ }
Review Comment:
Do we need this?
##########
publishing/grailsCentralPublishing.gradle:
##########
@@ -34,12 +34,12 @@ publishing {
if (isSnapshot) {
maven {
credentials {
- def u = System.getenv("ARTIFACTORY_USERNAME") ?:
project.hasProperty("artifactoryPublishUsername") ?
project.artifactoryPublishUsername : ''
- def p = System.getenv("ARTIFACTORY_PASSWORD") ?:
project.hasProperty("artifactoryPublishPassword") ?
project.artifactoryPublishPassword : ''
+ def u = System.getenv('MAVEN_PUBLISH_USERNAME')
+ def p = System.getenv('MAVEN_PUBLISH_PASSWORD')
username = u
password = p
Review Comment:
Skip variable and assign directly?
##########
build.gradle:
##########
@@ -1,10 +1,19 @@
buildscript {
+ ext {
+ grailsVersion = project.grailsVersion
+ }
repositories {
mavenCentral()
+ maven { url "https://repository.apache.org/content/groups/snapshots/"; }
+ maven { url "https://repo.grails.org/grails/core"; }
Review Comment:
User setter syntax (`url = `), single quotes and skip trailing slash?
Also, for other repos we have used
`https://repository.apache.org/content/repositories/snapshots`. I wonder if
there is a difference?
##########
publishing/grailsCentralPublishing.gradle:
##########
@@ -34,12 +34,12 @@ publishing {
if (isSnapshot) {
maven {
credentials {
- def u = System.getenv("ARTIFACTORY_USERNAME") ?:
project.hasProperty("artifactoryPublishUsername") ?
project.artifactoryPublishUsername : ''
- def p = System.getenv("ARTIFACTORY_PASSWORD") ?:
project.hasProperty("artifactoryPublishPassword") ?
project.artifactoryPublishPassword : ''
+ def u = System.getenv('MAVEN_PUBLISH_USERNAME')
+ def p = System.getenv('MAVEN_PUBLISH_PASSWORD')
username = u
password = p
}
- url "https://repo.grails.org/grails/libs-snapshots-local";
+ url System.getenv('MAVEN_PUBLISH_URL') ?:
'https://repository.apache.org/content/repositories/snapshots'
Review Comment:
Use setter syntax?
##########
wrapper/build.gradle:
##########
@@ -80,15 +59,16 @@ configurations {
repositories {
mavenCentral()
+ maven { url "https://repository.apache.org/content/groups/snapshots/"; }
Review Comment:
Use setter syntax, single quotes and skip trailing slash?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
