feedback: minor cleanup & styling

jdaugherty · jdaugherty · commit 50c20a9c85e0 · 2025-03-10T09:14:36.000-04:00
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -73,7 +73,10 @@ jobs:
           GRADLE_PUBLISH_RELEASE: 'false'
           MAVEN_PUBLISH_USERNAME: ${{ secrets.MAVEN_PUBLISH_USERNAME }}
           MAVEN_PUBLISH_PASSWORD: ${{ secrets.MAVEN_PUBLISH_PASSWORD }}
-        run: ./gradlew --no-build-cache publish && cd views/gradle-plugin && ./gradlew --no-build-cache publish
+        run: > 
+          ./gradlew --no-build-cache publish && 
+          cd views/gradle-plugin && 
+          ./gradlew --no-build-cache publish
       - name: "📖 Generate Snapshot Documentation"
         if: success()
         run: ./gradlew aggregateDocs
diff --git a/.sdkmanrc b/.sdkmanrc
@@ -1,3 +1,2 @@
 # Enable auto-env through the sdkman_auto_env config - https://sdkman.io/usage#env
 java=17.0.12-librca
-gradle=8.13
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -25,10 +25,7 @@ file("../gradle.properties").withReader {
 }
 
 dependencies {
-    implementation platform("org.grails:grails-bom:${gradleProperties.grailsVersion}"), {
-        exclude group: 'org.grails.plugins', module: 'views-gradle'
-        exclude group: 'org.grails.plugins', module: 'views-json'
-    }
+    implementation platform("org.grails:grails-bom:${gradleProperties.grailsVersion}")
     implementation "org.grails:grails-gradle-plugin"
     implementation "org.grails.plugins:views-gradle"
     implementation "org.grails:grails-docs"
diff --git a/fields/plugin/build.gradle b/fields/plugin/build.gradle
@@ -13,7 +13,7 @@ ext {
     pomTitle = 'Grails Fields Plugin'
     pomDescription = 'Customizable form-field rendering based on overrideable GSP template'
     pomDevelopers = [robfletcher: 'Rob Fletcher', graemerocher: "Graeme Rocher", sdelamo: "Sergio del Amo", sbglasius: 'Søren Berg Glasius']
-    mavenSnapshotPublishUrl = 'https://repo.grails.org/grails/plugins3-snapshots-local'
+    snapshotPublishUrl = 'https://repo.grails.org/grails/plugins3-snapshots-local'
 }
 
 dependencies {
diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,6 @@
 projectVersion=7.0.0-SNAPSHOT
 githubBranch = 7.0.x
 javaVersion=17
-
 # when updating grails version, be sure to update the views/gradle-plugin as well
 grailsVersion=7.0.0-M3
 joddWotVersion=3.3.8
@@ -10,7 +9,6 @@ elApiVersion=6.0.1
 jspApiVersion=4.0.0
 sitemeshVersion=3.2.2
 javassistVersion=3.30.2-GA
-
 micronautVersion=4.6.5
 
 # This prevents the Grails Gradle Plugin from unnecessarily excluding slf4j-simple in the generated POMs
diff --git a/gradle/publish-config.gradle b/gradle/publish-config.gradle
@@ -1,16 +1,13 @@
 import org.grails.gradle.plugin.publishing.GrailsPublishExtension
 
-if (project.hasProperty('mavenSnapshotPublishUrl')) {
-    ext.set('mavenPublishUrl', property('mavenSnapshotPublishUrl'))
+if (project.hasProperty('snapshotPublishUrl')) {
+    ext.set('mavenPublishUrl', property('snapshotPublishUrl'))
     logger.lifecycle('Configuring {}:{} snapshot publish repo: {}', group, findProperty('pomArtifactId') ?: name, mavenPublishUrl)
 }
 
 extensions.configure(GrailsPublishExtension) {
     // Explicit `it` is required here
-    String pomArtifactId = findProperty('pomArtifactId')
-    if(pomArtifactId) {
-        it.artifactId = pomArtifactId
-    }
+    it.artifactId = findProperty('pomArtifactId') ?: project.name
     it.githubSlug = 'grails/grails-views'
     it.license.name = 'Apache-2.0'
     it.title = findProperty('pomTitle') ?: 'Grails Views'
diff --git a/gsp/grails-gsp/build.gradle b/gsp/grails-gsp/build.gradle
@@ -10,7 +10,7 @@ ext {
     pomTitle = 'Groovy Server Pages (GSP)'
     pomDescription = 'Groovy Server Pages (GSP) - A server-side view rendering technology based on Groovy'
     pomDevelopers = ['graemerocher': 'Graeme Rocher']
-    mavenSnapshotPublishUrl = 'https://repo.grails.org/grails/libs-snapshots-local'
+    snapshotPublishUrl = 'https://repo.grails.org/grails/libs-snapshots-local'
 }
 
 dependencies {
diff --git a/gsp/grails-plugin-gsp/build.gradle b/gsp/grails-plugin-gsp/build.gradle
@@ -16,7 +16,7 @@ ext {
     pomTitle = 'Groovy Server Pages (GSP)'
     pomDescription = 'Groovy Server Pages (GSP) - A server-side view rendering technology based on Groovy'
     pomDevelopers = ['graemerocher': 'Graeme Rocher']
-    mavenSnapshotPublishUrl = 'https://repo.grails.org/grails/plugins3-snapshots-local'
+    snapshotPublishUrl = 'https://repo.grails.org/grails/plugins3-snapshots-local'
 }
 
 dependencies {
diff --git a/gsp/grails-plugin-sitemesh3/build.gradle b/gsp/grails-plugin-sitemesh3/build.gradle
@@ -13,7 +13,7 @@ ext {
     pomDevelopers = [
             [id: 'codeconsole', name: 'Scott Murphy Heiberg']
     ]
-    mavenSnapshotPublishUrl = 'https://repo.grails.org/grails/plugins3-snapshots-local'
+    snapshotPublishUrl = 'https://repo.grails.org/grails/plugins3-snapshots-local'
 }
 
 dependencies {
diff --git a/gsp/grails-taglib/build.gradle b/gsp/grails-taglib/build.gradle
@@ -10,7 +10,7 @@ ext {
     pomTitle = 'Groovy Server Pages (GSP)'
     pomDescription = 'Groovy Server Pages (GSP) - A server-side view rendering technology based on Groovy'
     pomDevelopers = ['graemerocher': 'Graeme Rocher']
-    mavenSnapshotPublishUrl = 'https://repo.grails.org/grails/libs-snapshots-local'
+    snapshotPublishUrl = 'https://repo.grails.org/grails/libs-snapshots-local'
 }
 
 dependencies {
diff --git a/gsp/grails-web-gsp-taglib/build.gradle b/gsp/grails-web-gsp-taglib/build.gradle
@@ -10,7 +10,7 @@ ext {
     pomTitle = 'Groovy Server Pages (GSP)'
     pomDescription = 'Groovy Server Pages (GSP) - A server-side view rendering technology based on Groovy'
     pomDevelopers = ['graemerocher': 'Graeme Rocher']
-    mavenSnapshotPublishUrl = 'https://repo.grails.org/grails/libs-snapshots-local'
+    snapshotPublishUrl = 'https://repo.grails.org/grails/libs-snapshots-local'
 }
 
 dependencies {
diff --git a/gsp/grails-web-gsp/build.gradle b/gsp/grails-web-gsp/build.gradle
@@ -10,7 +10,7 @@ ext {
     pomTitle = 'Groovy Server Pages (GSP)'
     pomDescription = 'Groovy Server Pages (GSP) - A server-side view rendering technology based on Groovy'
     pomDevelopers = ['graemerocher': 'Graeme Rocher']
-    mavenSnapshotPublishUrl = 'https://repo.grails.org/grails/libs-snapshots-local'
+    snapshotPublishUrl = 'https://repo.grails.org/grails/libs-snapshots-local'
 }
 
 dependencies {
diff --git a/gsp/grails-web-jsp/build.gradle b/gsp/grails-web-jsp/build.gradle
@@ -10,7 +10,7 @@ ext {
     pomTitle = 'Groovy Server Pages (GSP)'
     pomDescription = 'Groovy Server Pages (GSP) - A server-side view rendering technology based on Groovy'
     pomDevelopers = ['graemerocher': 'Graeme Rocher']
-    mavenSnapshotPublishUrl = 'https://repo.grails.org/grails/libs-snapshots-local'
+    snapshotPublishUrl = 'https://repo.grails.org/grails/libs-snapshots-local'
 }
 
 dependencies {
diff --git a/gsp/grails-web-taglib/build.gradle b/gsp/grails-web-taglib/build.gradle
@@ -10,7 +10,7 @@ ext {
     pomTitle = 'Groovy Server Pages (GSP)'
     pomDescription = 'Groovy Server Pages (GSP) - A server-side view rendering technology based on Groovy'
     pomDevelopers = ['graemerocher': 'Graeme Rocher']
-    mavenSnapshotPublishUrl = 'https://repo.grails.org/grails/libs-snapshots-local'
+    snapshotPublishUrl = 'https://repo.grails.org/grails/libs-snapshots-local'
 }
 
 dependencies {
diff --git a/gsp/grails-web-testing-support/build.gradle b/gsp/grails-web-testing-support/build.gradle
@@ -13,7 +13,7 @@ ext {
             [id: 'jeffscottbrown', name: 'Jeff Brown'],
             [id: 'jameskleeh', name: 'James Kleeh']
     ]
-    mavenSnapshotPublishUrl = 'https://repo.grails.org/grails/libs-snapshots-local'
+    snapshotPublishUrl = 'https://repo.grails.org/grails/libs-snapshots-local'
 }
 
 // Note: documentation for this project is published to grails-doc as part of the other testing documentation
diff --git a/scaffolding/build.gradle b/scaffolding/build.gradle
@@ -11,7 +11,7 @@ ext {
     pomTitle = 'Grails Scaffolding Plugin'
     pomDescription = 'Provides scaffolding for Grails applications'
     pomDevelopers = [puneetbehl: 'Puneet Behl']
-    mavenSnapshotPublishUrl = 'https://repo.grails.org/grails/plugins3-snapshots-local'
+    snapshotPublishUrl = 'https://repo.grails.org/grails/plugins3-snapshots-local'
 }
 
 dependencies {
diff --git a/views/core/build.gradle b/views/core/build.gradle
@@ -8,7 +8,7 @@ group = 'org.grails'
 
 ext {
     pomDescription = 'Grails Views Core'
-    mavenSnapshotPublishUrl = 'https://repo.grails.org/grails/libs-snapshots-local'
+    snapshotPublishUrl = 'https://repo.grails.org/grails/libs-snapshots-local'
 }
 
 dependencies {
diff --git a/views/gradle-plugin/build.gradle b/views/gradle-plugin/build.gradle
@@ -1,18 +1,11 @@
 import io.github.gradlenexus.publishplugin.InitializeNexusStagingRepository
 
-import static com.bmuschko.gradle.nexus.NexusPlugin.getSIGNING_KEYRING
-import static com.bmuschko.gradle.nexus.NexusPlugin.getSIGNING_KEY_ID
-import static com.bmuschko.gradle.nexus.NexusPlugin.getSIGNING_PASSWORD
-
 buildscript {
     repositories {
         maven { url = 'https://repo.grails.org/grails/core' }
     }
     dependencies {
-        classpath platform("org.grails:grails-bom:${grailsVersion}"), {
-            exclude group: 'org.grails.plugins', module: 'views-gradle'
-            exclude group: 'org.grails.plugins', module: 'views-json'
-        }
+        classpath platform("org.grails:grails-bom:${grailsVersion}")
         classpath 'org.grails:grails-gradle-plugin'
     }
 }
@@ -105,9 +98,9 @@ tasks.withType(Groovydoc).configureEach {
 ext.set('isRelease', System.getenv('GRAILS_PUBLISH_RELEASE') != null ? Boolean.parseBoolean(System.getenv('GRAILS_PUBLISH_RELEASE')) : !ext.gradleProperties.projectVersion.endsWith('SNAPSHOT'))
 ext.set('isSnapshot', !ext.isRelease)
 
-ext.set('signing.keyId', project.findProperty(SIGNING_KEY_ID) ?: System.getenv('SIGNING_KEY'))
-ext.set('signing.password', project.findProperty(SIGNING_PASSWORD) ?: System.getenv('SIGNING_PASSPHRASE'))
-ext.set('signing.secretKeyRingFile', project.findProperty(SIGNING_KEYRING) ?: System.getenv('SIGNING_KEYRING'))
+ext.set('signing.keyId', project.findProperty('signing.keyId') ?: System.getenv('SIGNING_KEY'))
+ext.set('signing.password', project.findProperty('signing.password') ?: System.getenv('SIGNING_PASSPHRASE'))
+ext.set('signing.secretKeyRingFile', project.findProperty('signing.secretKeyRingFile') ?: System.getenv('SIGNING_KEYRING'))
 ext.set('pomInfo', {
     delegate.url 'https://views.grails.org/latest/'
     delegate.licenses {
diff --git a/views/json-testing-support/build.gradle b/views/json-testing-support/build.gradle
@@ -8,7 +8,7 @@ group = 'org.grails'
 
 ext {
     pomDescription = 'JSON Views Testing Support'
-    mavenSnapshotPublishUrl = 'https://repo.grails.org/grails/libs-snapshots-local'
+    snapshotPublishUrl = 'https://repo.grails.org/grails/libs-snapshots-local'
 }
 
 dependencies {
diff --git a/views/json/build.gradle b/views/json/build.gradle
@@ -9,7 +9,7 @@ group = 'org.grails.plugins'
 
 ext {
     pomDescription = 'Grails JSON Views'
-    mavenSnapshotPublishUrl = 'https://repo.grails.org/grails/plugins3-snapshots-local'
+    snapshotPublishUrl = 'https://repo.grails.org/grails/plugins3-snapshots-local'
 }
 
 dependencies {
diff --git a/views/markup/build.gradle b/views/markup/build.gradle
@@ -9,7 +9,7 @@ group = 'org.grails'
 
 ext {
     pomDescription = 'Grails Markup Views'
-    mavenSnapshotPublishUrl = 'https://repo.grails.org/grails/plugins3-snapshots-local'
+    snapshotPublishUrl = 'https://repo.grails.org/grails/plugins3-snapshots-local'
 }
 
 dependencies {

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`# Enable auto-env through the sdkman_auto_env config - https://sdkman.io/usage#env`
`2`	`2`	`java=17.0.12-librca`
`3`		`-gradle=8.13`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ ext {`
`13`	`13`	`pomTitle = 'Grails Fields Plugin'`
`14`	`14`	`pomDescription = 'Customizable form-field rendering based on overrideable GSP template'`
`15`	`15`	`pomDevelopers = [robfletcher: 'Rob Fletcher', graemerocher: "Graeme Rocher", sdelamo: "Sergio del Amo", sbglasius: 'Søren Berg Glasius']`
`16`		`- mavenSnapshotPublishUrl = 'https://repo.grails.org/grails/plugins3-snapshots-local'`
	`16`	`+ snapshotPublishUrl = 'https://repo.grails.org/grails/plugins3-snapshots-local'`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ ext {`
`10`	`10`	`pomTitle = 'Groovy Server Pages (GSP)'`
`11`	`11`	`pomDescription = 'Groovy Server Pages (GSP) - A server-side view rendering technology based on Groovy'`
`12`	`12`	`pomDevelopers = ['graemerocher': 'Graeme Rocher']`
`13`		`- mavenSnapshotPublishUrl = 'https://repo.grails.org/grails/libs-snapshots-local'`
	`13`	`+ snapshotPublishUrl = 'https://repo.grails.org/grails/libs-snapshots-local'`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ ext {`
`16`	`16`	`pomTitle = 'Groovy Server Pages (GSP)'`
`17`	`17`	`pomDescription = 'Groovy Server Pages (GSP) - A server-side view rendering technology based on Groovy'`
`18`	`18`	`pomDevelopers = ['graemerocher': 'Graeme Rocher']`
`19`		`- mavenSnapshotPublishUrl = 'https://repo.grails.org/grails/plugins3-snapshots-local'`
	`19`	`+ snapshotPublishUrl = 'https://repo.grails.org/grails/plugins3-snapshots-local'`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ ext {`
`11`	`11`	`pomTitle = 'Grails Scaffolding Plugin'`
`12`	`12`	`pomDescription = 'Provides scaffolding for Grails applications'`
`13`	`13`	`pomDevelopers = [puneetbehl: 'Puneet Behl']`
`14`		`- mavenSnapshotPublishUrl = 'https://repo.grails.org/grails/plugins3-snapshots-local'`
	`14`	`+ snapshotPublishUrl = 'https://repo.grails.org/grails/plugins3-snapshots-local'`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ group = 'org.grails'`
`8`	`8`
`9`	`9`	`ext {`
`10`	`10`	`pomDescription = 'Grails Views Core'`
`11`		`- mavenSnapshotPublishUrl = 'https://repo.grails.org/grails/libs-snapshots-local'`
	`11`	`+ snapshotPublishUrl = 'https://repo.grails.org/grails/libs-snapshots-local'`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ group = 'org.grails.plugins'`
`9`	`9`
`10`	`10`	`ext {`
`11`	`11`	`pomDescription = 'Grails JSON Views'`
`12`		`- mavenSnapshotPublishUrl = 'https://repo.grails.org/grails/plugins3-snapshots-local'`
	`12`	`+ snapshotPublishUrl = 'https://repo.grails.org/grails/plugins3-snapshots-local'`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ group = 'org.grails'`
`9`	`9`
`10`	`10`	`ext {`
`11`	`11`	`pomDescription = 'Grails Markup Views'`
`12`		`- mavenSnapshotPublishUrl = 'https://repo.grails.org/grails/plugins3-snapshots-local'`
	`12`	`+ snapshotPublishUrl = 'https://repo.grails.org/grails/plugins3-snapshots-local'`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`dependencies {`