This is an automated email from the ASF dual-hosted git repository. matrei pushed a commit to branch post-gradle-merge in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 24fa862005862180377de0880fddf9786bd11bae Author: Mattias Reichel <[email protected]> AuthorDate: Wed Apr 16 11:14:56 2025 +0200 chore(build): align on single quotes for strings And also remove some whitespace. --- grails-gradle/docs-core/build.gradle | 47 +++++++++++++++---------------- grails-gradle/gradle/docs-config.gradle | 8 +++--- grails-gradle/model/build.gradle | 16 ++++------- grails-gradle/plugins/build.gradle | 50 +++++++++++++++------------------ 4 files changed, 54 insertions(+), 67 deletions(-) diff --git a/grails-gradle/docs-core/build.gradle b/grails-gradle/docs-core/build.gradle index 0acfac8897..0164339800 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) { @@ -85,13 +87,10 @@ publishing { publications { maven(MavenPublication) { 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' - licenses { license { name = 'The Apache Software License, Version 2.0' @@ -99,13 +98,11 @@ publishing { distribution = 'repo' } } - 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 { developer { id = 'graemerocher' diff --git a/grails-gradle/gradle/docs-config.gradle b/grails-gradle/gradle/docs-config.gradle index dbdccd3882..f229f140e2 100644 --- a/grails-gradle/gradle/docs-config.gradle +++ b/grails-gradle/gradle/docs-config.gradle @@ -4,10 +4,10 @@ dependencies { add('documentation', 'org.fusesource.jansi:jansi') add('documentation', 'jline:jline') add('documentation', 'com.github.javaparser:javaparser-core') - 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") + 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') } ext { diff --git a/grails-gradle/model/build.gradle b/grails-gradle/model/build.gradle index 30cf1bb65b..1fe8d6f9b3 100644 --- a/grails-gradle/model/build.gradle +++ b/grails-gradle/model/build.gradle @@ -69,15 +69,11 @@ publishing { maven(MavenPublication) { groupId = project.group artifactId = project.name - 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' - licenses { license { name = 'The Apache Software License, Version 2.0' @@ -85,13 +81,11 @@ publishing { distribution = 'repo' } } - 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 { developer { id = 'graemerocher' diff --git a/grails-gradle/plugins/build.gradle b/grails-gradle/plugins/build.gradle index 6f0ade239c..1e0b488936 100644 --- a/grails-gradle/plugins/build.gradle +++ b/grails-gradle/plugins/build.gradle @@ -5,85 +5,85 @@ plugins { } version = project.projectVersion -group = "org.apache.grails" +group = 'org.apache.grails' dependencies { - implementation platform(project(":grails-gradle-bom")) + implementation platform(project(':grails-gradle-bom')) // compile grails-gradle-plugin with the Groovy version provided by Gradle // to ensure build compatibility with Gradle, currently Groovy 3.0.x // see: https://docs.gradle.org/current/userguide/compatibility.html#groovy - compileOnly "org.codehaus.groovy:groovy" + compileOnly 'org.codehaus.groovy:groovy' implementation project(':grails-gradle-model'), { exclude group: 'org.apache.groovy' exclude group: 'org.spockframework' } - implementation "io.github.gradle-nexus:publish-plugin" - implementation "org.springframework.boot:spring-boot-gradle-plugin" - implementation "org.springframework.boot:spring-boot-loader-tools" - implementation "io.spring.gradle:dependency-management-plugin" + implementation 'io.github.gradle-nexus:publish-plugin' + implementation 'org.springframework.boot:spring-boot-gradle-plugin' + implementation 'org.springframework.boot:spring-boot-loader-tools' + implementation 'io.spring.gradle:dependency-management-plugin' } gradlePlugin { plugins { grailsCore { - displayName = "Grails Core Gradle Plugin" + displayName = 'Grails Core Gradle Plugin' description = 'The main Grails gradle plugin implementation' id = 'org.apache.grails.gradle.grails-app' implementationClass = 'org.grails.gradle.plugin.core.GrailsGradlePlugin' } grailsDoc { - displayName = "Grails Doc Gradle Plugin" + displayName = 'Grails Doc Gradle Plugin' description = 'Adds Grails doc publishing support' id = 'org.apache.grails.gradle.grails-docs' implementationClass = 'org.grails.gradle.plugin.doc.GrailsDocGradlePlugin' } grailsGsp { - displayName = "Grails GSP Gradle Plugin" + displayName = 'Grails GSP Gradle Plugin' description = 'A plugin that adds support for compiling Groovy Server Pages (GSP)' id = 'org.apache.grails.gradle.grails-gsp' implementationClass = 'org.grails.gradle.plugin.views.gsp.GroovyPagePlugin' } grailsGson { - displayName = "Grails GSON Gradle Plugin" + displayName = 'Grails GSON Gradle Plugin' description = 'A plugin that adds support for compiling Groovy Json Views (GSON)' id = 'org.apache.grails.gradle.grails-gson' implementationClass = 'org.grails.gradle.plugin.views.json.GrailsGsonViewsPlugin' } grailsMarkup { - displayName = "Grails Markup Gradle Plugin" + displayName = 'Grails Markup Gradle Plugin' description = 'A plugin that adds support for compiling Markup Views' id = 'org.apache.grails.gradle.grails-markup' implementationClass = 'org.grails.gradle.plugin.views.markup.GrailsMarkupViewsPlugin' } grailsPlugin { - displayName = "Grails-Plugin Gradle Plugin" + displayName = 'Grails-Plugin Gradle Plugin' description = 'A Gradle plugin for Grails plugins' id = 'org.apache.grails.gradle.grails-plugin' implementationClass = 'org.grails.gradle.plugin.core.GrailsPluginGradlePlugin' } grailsProfile { - displayName = "Grails Profile Gradle Plugin" + displayName = 'Grails Profile Gradle Plugin' description = 'A plugin that is capable of compiling a Grails profile into a JAR file for distribution' id = 'org.apache.grails.gradle.grails-profile' implementationClass = 'org.grails.gradle.plugin.profiles.GrailsProfileGradlePlugin' } grailsWeb { - displayName = "Grails Web Gradle Plugin" + displayName = 'Grails Web Gradle Plugin' description = 'Adds web specific extensions' id = 'org.apache.grails.gradle.grails-web' implementationClass = 'org.grails.gradle.plugin.web.GrailsWebGradlePlugin' } grailsPublish { - displayName = "Grails Publish Gradle Plugin" + displayName = 'Grails Publish Gradle Plugin' description = 'A plugin to assist in publishing Grails related artifacts' id = 'org.apache.grails.gradle.grails-publish' implementationClass = 'org.grails.gradle.plugin.publishing.GrailsPublishGradlePlugin' } grailsProfilePublish { - displayName = "Grails Profile Publish Plugin" + displayName = 'Grails Profile Publish Plugin' description = 'A plugin for publishing profiles' id = 'org.apache.grails.gradle.grails-publish-profile' implementationClass = 'org.grails.gradle.plugin.profiles.GrailsProfilePublishGradlePlugin' @@ -114,7 +114,7 @@ publishing { // publishAllPublicationsToTestCaseMavenRepoRepository repositories { maven { - name = "TestCaseMavenRepo" + name = 'TestCaseMavenRepo' url = rootProject.layout.buildDirectory.dir('local-maven') } } @@ -122,11 +122,9 @@ 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' - licenses { license { name = 'The Apache Software License, Version 2.0' @@ -134,13 +132,11 @@ publishing { distribution = 'repo' } } - 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 { developer { id = 'graemerocher'
