This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a commit to branch grails-views-merge
in repository https://gitbox.apache.org/repos/asf/grails-core.git
The following commit(s) were added to refs/heads/grails-views-merge by this
push:
new 4ee9cb5766 feedback - styling
4ee9cb5766 is described below
commit 4ee9cb57660a46e7545e909dd46ae287c500306b
Author: James Daugherty <[email protected]>
AuthorDate: Thu Apr 17 11:17:27 2025 -0400
feedback - styling
---
gradle/docs-dependencies.gradle | 8 +++---
grails-bom/build.gradle | 5 ++--
grails-gradle/bom/build.gradle | 10 ++++----
grails-gradle/docs-core/build.gradle | 48 +++++++++++++++++++-----------------
grails-gradle/model/build.gradle | 24 ++++++++++--------
grails-gradle/plugins/build.gradle | 18 +++++++-------
6 files changed, 60 insertions(+), 53 deletions(-)
diff --git a/gradle/docs-dependencies.gradle b/gradle/docs-dependencies.gradle
index de340b676e..943429c887 100644
--- a/gradle/docs-dependencies.gradle
+++ b/gradle/docs-dependencies.gradle
@@ -4,8 +4,8 @@ dependencies {
add('documentation', 'org.fusesource.jansi:jansi')
add('documentation', 'jline:jline')
add('documentation', 'com.github.javaparser:javaparser-core')
- add('documentation', "org.codehaus.groovy:groovy:$GroovySystem.version")
- add('documentation',
"org.codehaus.groovy:groovy-ant:$GroovySystem.version")
- add('documentation',
"org.codehaus.groovy:groovy-docgenerator:$GroovySystem.version")
- add('documentation',
"org.codehaus.groovy:groovy-templates:$GroovySystem.version")
+ add('documentation', 'org.codehaus.groovy:groovy')
+ add('documentation', 'org.codehaus.groovy:groovy-ant')
+ add('documentation', 'org.codehaus.groovy:groovy-docgenerator')
+ add('documentation', 'org.codehaus.groovy:groovy-templates')
}
\ No newline at end of file
diff --git a/grails-bom/build.gradle b/grails-bom/build.gradle
index 3bf4fbbeb8..96df7cde25 100644
--- a/grails-bom/build.gradle
+++ b/grails-bom/build.gradle
@@ -49,7 +49,8 @@ dependencies {
api project(":${subproject.path}")
}
- // TODO: since we're duplicating the bom instead of inheriting we have
to add the grails-gradle projects
+ // since we're duplicating the bom instead of inheriting we have to
add the grails-gradle projects
+ // TODO: It should be possible to pull these build names using
includedBuild, but I haven't found a way to do so
api "org.apache.grails:grails-gradle-plugins:${projectVersion}"
api "org.apache.grails.gradle:grails-gradle-model:${projectVersion}"
api "org.apache.grails:grails-docs-core:${projectVersion}"
@@ -254,7 +255,7 @@ Closure determinePropertyName = { String groupId, String
artifactId, String vers
}
ext {
- pomDescription = "Grails BOM (Bill of Materials) for managing dependency
versions used by Grails Projects"
+ pomDescription = 'Grails BOM (Bill of Materials) for managing dependency
versions used by Grails Projects'
pomCustomization = { ->
def root = asNode()
diff --git a/grails-gradle/bom/build.gradle b/grails-gradle/bom/build.gradle
index 63d4ed5126..eb9e7de1b9 100644
--- a/grails-gradle/bom/build.gradle
+++ b/grails-gradle/bom/build.gradle
@@ -90,10 +90,10 @@ publishing {
repositories {
maven {
credentials {
- username = System.getenv("MAVEN_PUBLISH_USERNAME")
- password = System.getenv("MAVEN_PUBLISH_PASSWORD")
+ username = System.getenv('MAVEN_PUBLISH_USERNAME')
+ password = System.getenv('MAVEN_PUBLISH_PASSWORD')
}
- url = System.getenv("MAVEN_PUBLISH_URL") ?:
'https://repository.apache.org/content/repositories/snapshots'
+ url = System.getenv('MAVEN_PUBLISH_URL') ?:
'https://repository.apache.org/content/repositories/snapshots'
}
}
}
@@ -102,7 +102,7 @@ publishing {
// publishAllPublicationsToTestCaseMavenRepoRepository
repositories {
maven {
- name = "TestCaseMavenRepo"
+ name = 'TestCaseMavenRepo'
url = rootProject.layout.buildDirectory.dir('local-maven')
}
}
@@ -141,7 +141,7 @@ publishing {
pomProperties.put(propertyName, inlineVersion)
}
} else if (!inlineVersion) {
- throw new GradleException("Dependency
$groupId:$artifactId does not have a version.")
+ throw new GradleException('Dependency
$groupId:$artifactId does not have a version.')
}
}
diff --git a/grails-gradle/docs-core/build.gradle
b/grails-gradle/docs-core/build.gradle
index f5582b0294..52ff1d0b8a 100644
--- a/grails-gradle/docs-core/build.gradle
+++ b/grails-gradle/docs-core/build.gradle
@@ -19,22 +19,24 @@ dependencies {
// grails-docs classes are used in Gradle builds,
// so we must compile with Groovy 3 until Gradle upgrades to Groovy 4.
- compileOnly "org.codehaus.groovy:groovy"
- compileOnly "org.codehaus.groovy:groovy-ant"
+ compileOnly 'org.codehaus.groovy:groovy'
+ compileOnly 'org.codehaus.groovy:groovy-ant'
- api "org.apache.commons:commons-text"
- api "org.slf4j:jcl-over-slf4j"
- api "org.apache.ant:ant"
- api "org.grails:grails-gdoc-engine"
- api "org.yaml:snakeyaml"
+ api 'org.apache.commons:commons-text'
+ api 'org.slf4j:jcl-over-slf4j'
+ api 'org.apache.ant:ant'
+ api 'org.grails:grails-gdoc-engine'
+ api 'org.yaml:snakeyaml'
- api "org.asciidoctor:asciidoctorj"
- implementation "org.xhtmlrenderer:flying-saucer-pdf-openpdf"
+ api 'org.asciidoctor:asciidoctorj'
+ implementation 'org.xhtmlrenderer:flying-saucer-pdf-openpdf'
- runtimeOnly "org.slf4j:slf4j-api"
+ runtimeOnly 'org.slf4j:slf4j-api'
- api "org.jsoup:jsoup"
- testImplementation("org.spockframework:spock-core") { transitive = false }
+ api 'org.jsoup:jsoup'
+ testImplementation('org.spockframework:spock-core') {
+ transitive = false
+ }
testImplementation 'org.codehaus.groovy:groovy-test-junit5'
testImplementation 'org.junit.jupiter:junit-jupiter-api'
@@ -49,11 +51,11 @@ sourceSets {
}
}
-tasks.register("docFilesJar", Jar) {
+tasks.register('docFilesJar', Jar) {
description = 'Package up files used for generating documentation.'
archiveVersion = null
- archiveFileName = "grails-doc-files.jar"
- from "src/main/template"
+ archiveFileName = 'grails-doc-files.jar'
+ from 'src/main/template'
}
tasks.named('jar', Jar).configure { Jar it ->
@@ -74,10 +76,10 @@ publishing {
repositories {
maven {
credentials {
- username = System.getenv("MAVEN_PUBLISH_USERNAME")
- password = System.getenv("MAVEN_PUBLISH_PASSWORD")
+ username = System.getenv('MAVEN_PUBLISH_USERNAME')
+ password = System.getenv('MAVEN_PUBLISH_PASSWORD')
}
- url = System.getenv("MAVEN_PUBLISH_URL") ?:
'https://repository.apache.org/content/repositories/snapshots'
+ url = System.getenv('MAVEN_PUBLISH_URL') ?:
'https://repository.apache.org/content/repositories/snapshots'
}
}
}
@@ -87,8 +89,8 @@ publishing {
from components.java
pom {
- name = "Grails Gradle Plugin"
- description = "A Gradle plugin for Grails which provides a
bunch of useful plugins"
+ name = 'Grails Gradle Plugin'
+ description = 'A Gradle plugin for Grails which provides a
bunch of useful plugins'
url = 'https://github.com/apache/grails-core'
@@ -101,9 +103,9 @@ publishing {
}
scm {
- url = "scm:[email protected]:apache/grails-core.git"
- connection = "scm:[email protected]:apache/grails-core.git"
- developerConnection =
"scm:[email protected]:apache/grails-core.git"
+ url = 'scm:[email protected]:apache/grails-core.git'
+ connection = 'scm:[email protected]:apache/grails-core.git'
+ developerConnection =
'scm:[email protected]:apache/grails-core.git'
}
developers {
diff --git a/grails-gradle/model/build.gradle b/grails-gradle/model/build.gradle
index 44632b2afb..24d145fff0 100644
--- a/grails-gradle/model/build.gradle
+++ b/grails-gradle/model/build.gradle
@@ -25,7 +25,9 @@ dependencies {
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
implementation 'org.springframework:spring-context'
- implementation 'org.springframework.boot:spring-boot-autoconfigure' //
required for org.springframework.boot.env.YamlPropertySourceLoader
+ implementation 'org.springframework.boot:spring-boot-autoconfigure', {
+ // impl: org.springframework.boot.env.YamlPropertySourceLoader
+ }
compileOnly 'jline:jline' // for profile compilation
@@ -39,7 +41,9 @@ dependencies {
testImplementation 'org.codehaus.groovy:groovy'
testImplementation 'org.codehaus.groovy:groovy-xml'
testImplementation 'org.slf4j:slf4j-simple'
- testImplementation('org.spockframework:spock-core') { transitive = false }
+ testImplementation('org.spockframework:spock-core') {
+ transitive = false
+ }
// Required by Spock's Mocking
testRuntimeOnly 'net.bytebuddy:byte-buddy'
testImplementation 'org.objenesis:objenesis'
@@ -56,10 +60,10 @@ publishing {
repositories {
maven {
credentials {
- username = System.getenv("MAVEN_PUBLISH_USERNAME")
- password = System.getenv("MAVEN_PUBLISH_PASSWORD")
+ username = System.getenv('MAVEN_PUBLISH_USERNAME')
+ password = System.getenv('MAVEN_PUBLISH_PASSWORD')
}
- url = System.getenv("MAVEN_PUBLISH_URL") ?:
'https://repository.apache.org/content/repositories/snapshots'
+ url = System.getenv('MAVEN_PUBLISH_URL') ?:
'https://repository.apache.org/content/repositories/snapshots'
}
}
}
@@ -72,8 +76,8 @@ publishing {
from components.java
pom {
- name = "Grails Gradle Model"
- description = "Classes to support the Grails Gradle Plugins"
+ name = 'Grails Gradle Model'
+ description = 'Classes to support the Grails Gradle Plugins'
url = 'https://github.com/apache/grails-core'
@@ -86,9 +90,9 @@ publishing {
}
scm {
- url = "scm:[email protected]:apache/grails-core.git"
- connection = "scm:[email protected]:apache/grails-core.git"
- developerConnection =
"scm:[email protected]:apache/grails-core.git"
+ url = 'scm:[email protected]:apache/grails-core.git'
+ connection = 'scm:[email protected]:apache/grails-core.git'
+ developerConnection =
'scm:[email protected]:apache/grails-core.git'
}
developers {
diff --git a/grails-gradle/plugins/build.gradle
b/grails-gradle/plugins/build.gradle
index 830e8fc205..8e1bb9dfe5 100644
--- a/grails-gradle/plugins/build.gradle
+++ b/grails-gradle/plugins/build.gradle
@@ -102,10 +102,10 @@ publishing {
repositories {
maven {
credentials {
- username = System.getenv("MAVEN_PUBLISH_USERNAME")
- password = System.getenv("MAVEN_PUBLISH_PASSWORD")
+ username = System.getenv('MAVEN_PUBLISH_USERNAME')
+ password = System.getenv('MAVEN_PUBLISH_PASSWORD')
}
- url = System.getenv("MAVEN_PUBLISH_URL") ?:
'https://repository.apache.org/content/repositories/snapshots'
+ url = System.getenv('MAVEN_PUBLISH_URL') ?:
'https://repository.apache.org/content/repositories/snapshots'
}
}
}
@@ -114,7 +114,7 @@ publishing {
// publishAllPublicationsToTestCaseMavenRepoRepository
repositories {
maven {
- name = "TestCaseMavenRepo"
+ name = 'TestCaseMavenRepo'
url = rootProject.layout.buildDirectory.dir('local-maven')
}
}
@@ -122,8 +122,8 @@ publishing {
publications {
pluginMaven(MavenPublication) {
pom {
- name = "Grails Gradle Plugin"
- description = "A Gradle plugin for Grails which provides a
bunch of useful plugins"
+ name = 'Grails Gradle Plugin'
+ description = 'A Gradle plugin for Grails which provides a
bunch of useful plugins'
url = 'https://github.com/apache/grails-core'
@@ -136,9 +136,9 @@ publishing {
}
scm {
- url = "scm:[email protected]:apache/grails-core.git"
- connection = "scm:[email protected]:apache/grails-core.git"
- developerConnection =
"scm:[email protected]:apache/grails-core.git"
+ url = 'scm:[email protected]:apache/grails-core.git'
+ connection = 'scm:[email protected]:apache/grails-core.git'
+ developerConnection =
'scm:[email protected]:apache/grails-core.git'
}
developers {
