From 7e0b7e68ab9060f50b70e6b512818fa34b274af6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Berg=20Glasius?= Date: Mon, 4 May 2026 16:07:00 +0200 Subject: [PATCH 1/6] refactor: replace hardcoded URLs with dynamic placeholders for improved configurability - Updated documentation links and project metadata to use placeholders (e.g., `@GITHUB_REPO_URL@`, `@REPO_SLUG@`). - Dynamically resolve repository details via Gradle project properties. - Enhanced documentation build process to replace tokens with computed values. --- build-logic/src/main/groovy/config.docs.gradle | 16 ++++++++++++++-- docs/build.gradle | 3 +-- docs/src/docs/index.tmpl | 16 ++++++++-------- gradle.properties | 2 ++ gradle/publish.gradle | 8 ++++---- plugin/build.gradle | 6 ++++-- 6 files changed, 33 insertions(+), 18 deletions(-) diff --git a/build-logic/src/main/groovy/config.docs.gradle b/build-logic/src/main/groovy/config.docs.gradle index 7ce6e44..712bff8 100644 --- a/build-logic/src/main/groovy/config.docs.gradle +++ b/build-logic/src/main/groovy/config.docs.gradle @@ -71,9 +71,12 @@ tasks.register('ghPagesRootIndexPage') { outputs.file(outputFile) doLast { + def githubUser = rootProject.findProperty('githubUser') as String + def githubProject = rootProject.findProperty('githubProject') as String + List versions = [] try { - def conn = URI.create('https://api.github.com/repos/gpc/grails-export/contents/?ref=gh-pages').toURL().openConnection() + def conn = URI.create("https://api.github.com/repos/${githubUser}/${githubProject}/contents/?ref=gh-pages").toURL().openConnection() conn.setRequestProperty('Accept', 'application/vnd.github+json') conn.setRequestProperty('User-Agent', 'gradle-docs-build') def parsed = new groovy.json.JsonSlurper().parse(conn.inputStream) @@ -91,8 +94,17 @@ tasks.register('ghPagesRootIndexPage') { ? versions.collect { v -> "" }.join('\n ') : '' + def tokens = [ + '@OTHER_VERSIONS_OPTIONS@': optionsHtml, + '@GITHUB_REPO_URL@' : "https://github.com/${githubUser}/${githubProject}", + '@GITHUB_ORG_URL@' : "https://github.com/${githubUser}", + '@REPO_SLUG@' : githubProject, + ] + def out = outputFile.get().asFile out.parentFile.mkdirs() - out.text = templateFile.get().asFile.text.replace('@OTHER_VERSIONS_OPTIONS@', optionsHtml) + def content = templateFile.get().asFile.text + tokens.each { token, value -> content = content.replace(token, value) } + out.text = content } } diff --git a/docs/build.gradle b/docs/build.gradle index f077b23..cffecf4 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -17,10 +17,9 @@ def asciidoctorAttributes = [ idprefix : '', idseparator : '-', version : project.version, - projectUrl : 'https://github.com/gpc/grails-export', + projectUrl : "https://github.com/${rootProject.findProperty('githubUser')}/${rootProject.findProperty('githubProject')}", sourcedir : "${rootProject.allprojects.find { it.name == 'grails-export' }.projectDir}/src/main/groovy", grailsVersion : grailsVersion -// grailsDocBase : "https://grails.apache.org/docs/${resolveGrailsDocsDirName(project.grailsVersion)}" ] tasks.named('asciidoctor', AsciidoctorTask) { diff --git a/docs/src/docs/index.tmpl b/docs/src/docs/index.tmpl index dfa0759..a13d6a0 100644 --- a/docs/src/docs/index.tmpl +++ b/docs/src/docs/index.tmpl @@ -287,7 +287,7 @@
- + @@ -307,13 +307,13 @@ Latest Release

Stable Version

- + User Guide - + @@ -326,13 +326,13 @@ Snapshot

Development Version

- + User Guide - + @@ -375,15 +375,15 @@ function update() { var v = sel.value; if (!v) return; - guide.href = '/grails-export/' + v + '/'; - api.href = '/grails-export/' + v + '/gapi/'; + guide.href = '/@REPO_SLUG@/' + v + '/'; + api.href = '/@REPO_SLUG@/' + v + '/gapi/'; } sel.addEventListener('change', update); })(); diff --git a/gradle.properties b/gradle.properties index 662d3c3..3be46db 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,7 @@ projectVersion=7.0.1-SNAPSHOT grailsVersion=7.0.10 +githubUser=gpc +githubProject=grails-export # Comma-separated list of projects to publish projectsToPublish=grails-export # Build dependencies diff --git a/gradle/publish.gradle b/gradle/publish.gradle index 67c9451..5b8cdd5 100644 --- a/gradle/publish.gradle +++ b/gradle/publish.gradle @@ -12,13 +12,13 @@ if (bintrayProperties.exists()) { user = project.bintrayUsername key = project.bintrayApiKey - githubSlug = 'gpc/grails-export' + githubSlug = "${project.findProperty('githubUser')}/${project.findProperty('githubProject')}" license { name = 'Apache-2.0' } - title = "Export" + title = "Grails Export Plugin" desc = "This plugin offers export functionality supporting different formats e.g. CSV, Excel, Open Document Spreadsheet, PDF and XML and can be extended to add additional formats." developers = [ graemerocher: 'Graeme Rocher', @@ -50,7 +50,7 @@ if (githubProperties.exists()) { } githubPages { - repoUri = 'https://github.com/gpc/grails-export.git' + repoUri = "https://github.com/${project.findProperty('githubUser')}/${project.findProperty('githubProject')}.git" credentials { username = project.hasProperty('githubApiKey') ? project.githubApiKey : '' @@ -64,4 +64,4 @@ if (githubProperties.exists()) { task publishDocs(dependsOn: [docs, publishGhPages]) << { } -} \ No newline at end of file +} diff --git a/plugin/build.gradle b/plugin/build.gradle index ed5de52..0e7424a 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -36,14 +36,16 @@ dependencies { } extensions.configure(org.apache.grails.gradle.publish.GrailsPublishExtension) { + def githubUser = rootProject.findProperty('githubUser') + def githubProject = rootProject.findProperty('githubProject') it.artifactId = project.name - it.githubSlug = 'gpc/grails-export' + it.githubSlug = "${githubUser}/${githubProject}" it.license.name = 'Apache-2.0' it.title = 'Grails Export Plugin' it.desc = 'This plugin offers export functionality supporting different formats e.g. CSV, Excel, Open Document Spreadsheet, PDF and XML and can be extended to add additional formats.' it.organization { it.name = 'Grails Plugin Collective (GPC)' - it.url = 'https://github.com/gpc' + it.url = "https://github.com/${githubUser}" } it.developers = [ graemerocher:'Graeme Rocher', From 384a630f8ed03827196fdd0974006c7dee1d01e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Berg=20Glasius?= Date: Mon, 4 May 2026 17:19:04 +0200 Subject: [PATCH 2/6] refactor: show latest release, sort releases by newest first. * Metadata in gradle.properties: index.tmlp now 100% generic, as it uses metadata from gradle.properties * Same data is used in plugin/build.gradle (except from developers) --- .../src/main/groovy/config.docs.gradle | 44 +++++++++++++------ docs/src/docs/index.tmpl | 9 ++-- gradle.properties | 5 +++ plugin/build.gradle | 6 +-- 4 files changed, 44 insertions(+), 20 deletions(-) diff --git a/build-logic/src/main/groovy/config.docs.gradle b/build-logic/src/main/groovy/config.docs.gradle index 712bff8..e7bb4c7 100644 --- a/build-logic/src/main/groovy/config.docs.gradle +++ b/build-logic/src/main/groovy/config.docs.gradle @@ -65,40 +65,58 @@ tasks.register('ghPagesRootIndexPage') { group = 'documentation' def templateFile = docProject.map { it.layout.projectDirectory.file('src/docs/index.tmpl') } - def outputFile = rootProject.layout.buildDirectory.file('docs/ghpages.html') + def outputFile = rootProject.layout.buildDirectory.file('docs/ghpages.html') inputs.file(templateFile) outputs.file(outputFile) doLast { - def githubUser = rootProject.findProperty('githubUser') as String + def githubUser = rootProject.findProperty('githubUser') as String def githubProject = rootProject.findProperty('githubProject') as String List versions = [] + String latestVersion = "" try { def conn = URI.create("https://api.github.com/repos/${githubUser}/${githubProject}/contents/?ref=gh-pages").toURL().openConnection() conn.setRequestProperty('Accept', 'application/vnd.github+json') conn.setRequestProperty('User-Agent', 'gradle-docs-build') def parsed = new groovy.json.JsonSlurper().parse(conn.inputStream) versions = (parsed as List) - .findAll { it.type == 'dir' } - .collect { it.name as String } - .findAll { it ==~ /\d+\.\d+\.(\d+|x)(-.*)?/ } - .sort() - .reverse() + .findAll { it.type == 'dir' } + .collect { it.name as String } + .findAll { it ==~ /\d+\.\d+\.(\d+|x)(-.*)?/ } + .toSorted { a, b -> + // Parse into [major, minor, patch, qualifier] + // patch 'x' becomes -1 so it sorts below any numeric patch + // qualifier '' (stable) sorts above any pre-release string + def parseVer = { String v -> + def m = v =~ /^(\d+)\.(\d+)\.(x|\d+)(?:-(.+))?$/ + if (!m) return [0, 0, -2, ''] + [m[0][1] as int, m[0][2] as int, m[0][3] == 'x' ? -1 : m[0][3] as int, m[0][4] ?: ''] + } + def av = parseVer(a) + def bv = parseVer(b) + return bv[0] <=> av[0] ?: bv[1] <=> av[1] ?: bv[2] <=> av[2] ?: + (!av[3] && bv[3] ? -1 : av[3] && !bv[3] ? 1 : bv[3] <=> av[3]) // RC and other postfix versions + } + latestVersion = versions ? versions.first() : '' } catch (Exception e) { logger.warn("ghPagesRootIndexPage: could not fetch GitHub versions — ${e.message}") } String optionsHtml = versions - ? versions.collect { v -> "" }.join('\n ') - : '' + ? versions.collect { v -> "" }.join('\n ') + : '' def tokens = [ - '@OTHER_VERSIONS_OPTIONS@': optionsHtml, - '@GITHUB_REPO_URL@' : "https://github.com/${githubUser}/${githubProject}", - '@GITHUB_ORG_URL@' : "https://github.com/${githubUser}", - '@REPO_SLUG@' : githubProject, + '@LATEST_VERSION@' : latestVersion, + '@OTHER_VERSIONS_OPTIONS@': optionsHtml, + '@GITHUB_REPO_URL@' : "https://github.com/${githubUser}/${githubProject}", + '@GITHUB_ORG_URL@' : "https://github.com/${githubUser}", + '@PROJECT_TITLE@' : "${projectTitle}", + '@PROJECT_DESCRIPTION@' : "${projectDescription}", + '@PROJECT_ORG@' : "${projectOrg}", + '@REPO_SLUG@' : githubProject, ] def out = outputFile.get().asFile diff --git a/docs/src/docs/index.tmpl b/docs/src/docs/index.tmpl index a13d6a0..de0efa5 100644 --- a/docs/src/docs/index.tmpl +++ b/docs/src/docs/index.tmpl @@ -3,7 +3,7 @@ - Export - Grails Plugin + @PROJECT_TITLE@ @@ -294,8 +294,8 @@ View on GitHub
-

Export

-

A Grails plugin that adds export functionality for CSV, Excel, ODS, PDF, RTF, and XML formats

+

@PROJECT_TITLE@

+

@PROJECT_DESCRIPTION@

@@ -305,6 +305,7 @@
Latest Release + @LATEST_VERSION@

Stable Version

@@ -383,7 +384,7 @@ diff --git a/gradle.properties b/gradle.properties index 3be46db..de22a3b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,12 @@ projectVersion=7.0.1-SNAPSHOT grailsVersion=7.0.10 +# GitHub repository metadata githubUser=gpc githubProject=grails-export +# Project metadata +projectTitle=Grails Export Plugin +projectDescription=A Grails plugin that adds export functionality for CSV, Excel, ODS, PDF, RTF, and XML formats. +projectOrg=Grails Plugin Collective (GPC) # Comma-separated list of projects to publish projectsToPublish=grails-export # Build dependencies diff --git a/plugin/build.gradle b/plugin/build.gradle index 0e7424a..e4b2abe 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -41,10 +41,10 @@ extensions.configure(org.apache.grails.gradle.publish.GrailsPublishExtension) { it.artifactId = project.name it.githubSlug = "${githubUser}/${githubProject}" it.license.name = 'Apache-2.0' - it.title = 'Grails Export Plugin' - it.desc = 'This plugin offers export functionality supporting different formats e.g. CSV, Excel, Open Document Spreadsheet, PDF and XML and can be extended to add additional formats.' + it.title = "${projectTitle}" + it.desc = "${projectDescription}" it.organization { - it.name = 'Grails Plugin Collective (GPC)' + it.name = "${projectOrg}" it.url = "https://github.com/${githubUser}" } it.developers = [ From d07c0f2bd72a52fb8b050b10e008829242e410b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Berg=20Glasius?= Date: Mon, 4 May 2026 19:43:13 +0200 Subject: [PATCH 3/6] chore: rename githubUser to githubOrg for consistency and clarity --- build-logic/src/main/groovy/config.docs.gradle | 8 ++++---- docs/build.gradle | 2 +- gradle.properties | 2 +- gradle/publish.gradle | 4 ++-- plugin/build.gradle | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build-logic/src/main/groovy/config.docs.gradle b/build-logic/src/main/groovy/config.docs.gradle index e7bb4c7..17ab08e 100644 --- a/build-logic/src/main/groovy/config.docs.gradle +++ b/build-logic/src/main/groovy/config.docs.gradle @@ -71,13 +71,13 @@ tasks.register('ghPagesRootIndexPage') { outputs.file(outputFile) doLast { - def githubUser = rootProject.findProperty('githubUser') as String + def githubOrg = rootProject.findProperty('githubOrg') as String def githubProject = rootProject.findProperty('githubProject') as String List versions = [] String latestVersion = "" try { - def conn = URI.create("https://api.github.com/repos/${githubUser}/${githubProject}/contents/?ref=gh-pages").toURL().openConnection() + def conn = URI.create("https://api.github.com/repos/${githubOrg}/${githubProject}/contents/?ref=gh-pages").toURL().openConnection() conn.setRequestProperty('Accept', 'application/vnd.github+json') conn.setRequestProperty('User-Agent', 'gradle-docs-build') def parsed = new groovy.json.JsonSlurper().parse(conn.inputStream) @@ -111,8 +111,8 @@ tasks.register('ghPagesRootIndexPage') { def tokens = [ '@LATEST_VERSION@' : latestVersion, '@OTHER_VERSIONS_OPTIONS@': optionsHtml, - '@GITHUB_REPO_URL@' : "https://github.com/${githubUser}/${githubProject}", - '@GITHUB_ORG_URL@' : "https://github.com/${githubUser}", + '@GITHUB_REPO_URL@' : "https://github.com/${githubOrg}/${githubProject}", + '@GITHUB_ORG_URL@' : "https://github.com/${githubOrg}", '@PROJECT_TITLE@' : "${projectTitle}", '@PROJECT_DESCRIPTION@' : "${projectDescription}", '@PROJECT_ORG@' : "${projectOrg}", diff --git a/docs/build.gradle b/docs/build.gradle index cffecf4..04c53f4 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -17,7 +17,7 @@ def asciidoctorAttributes = [ idprefix : '', idseparator : '-', version : project.version, - projectUrl : "https://github.com/${rootProject.findProperty('githubUser')}/${rootProject.findProperty('githubProject')}", + projectUrl : "https://github.com/${rootProject.findProperty('githubOrg')}/${rootProject.findProperty('githubProject')}", sourcedir : "${rootProject.allprojects.find { it.name == 'grails-export' }.projectDir}/src/main/groovy", grailsVersion : grailsVersion ] diff --git a/gradle.properties b/gradle.properties index de22a3b..16d497d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ projectVersion=7.0.1-SNAPSHOT grailsVersion=7.0.10 # GitHub repository metadata -githubUser=gpc +githubOrg=gpc githubProject=grails-export # Project metadata projectTitle=Grails Export Plugin diff --git a/gradle/publish.gradle b/gradle/publish.gradle index 5b8cdd5..00cee26 100644 --- a/gradle/publish.gradle +++ b/gradle/publish.gradle @@ -12,7 +12,7 @@ if (bintrayProperties.exists()) { user = project.bintrayUsername key = project.bintrayApiKey - githubSlug = "${project.findProperty('githubUser')}/${project.findProperty('githubProject')}" + githubSlug = "${project.findProperty('githubOrg')}/${project.findProperty('githubProject')}" license { name = 'Apache-2.0' @@ -50,7 +50,7 @@ if (githubProperties.exists()) { } githubPages { - repoUri = "https://github.com/${project.findProperty('githubUser')}/${project.findProperty('githubProject')}.git" + repoUri = "https://github.com/${project.findProperty('githubOrg')}/${project.findProperty('githubProject')}.git" credentials { username = project.hasProperty('githubApiKey') ? project.githubApiKey : '' diff --git a/plugin/build.gradle b/plugin/build.gradle index e4b2abe..dd6516d 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -36,16 +36,16 @@ dependencies { } extensions.configure(org.apache.grails.gradle.publish.GrailsPublishExtension) { - def githubUser = rootProject.findProperty('githubUser') + def githubUser = rootProject.findProperty('githubOrg') def githubProject = rootProject.findProperty('githubProject') it.artifactId = project.name - it.githubSlug = "${githubUser}/${githubProject}" + it.githubSlug = "${githubOrg}/${githubProject}" it.license.name = 'Apache-2.0' it.title = "${projectTitle}" it.desc = "${projectDescription}" it.organization { it.name = "${projectOrg}" - it.url = "https://github.com/${githubUser}" + it.url = "https://github.com/${githubOrg}" } it.developers = [ graemerocher:'Graeme Rocher', From f1eb4affcabb18c8d9da305582c114b3cb2186ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Berg=20Glasius?= Date: Mon, 4 May 2026 23:40:29 +0200 Subject: [PATCH 4/6] chore: Automatically read contributors from GitHub when building pom. --- .../main/groovy/config.contributors.gradle | 9 ++ .../groovy/contributor/ContributorTask.groovy | 95 +++++++++++++++++++ plugin/build.gradle | 37 ++++---- 3 files changed, 123 insertions(+), 18 deletions(-) create mode 100644 build-logic/src/main/groovy/config.contributors.gradle create mode 100644 build-logic/src/main/groovy/contributor/ContributorTask.groovy diff --git a/build-logic/src/main/groovy/config.contributors.gradle b/build-logic/src/main/groovy/config.contributors.gradle new file mode 100644 index 0000000..89a21a0 --- /dev/null +++ b/build-logic/src/main/groovy/config.contributors.gradle @@ -0,0 +1,9 @@ + +def fetchContributors = tasks.register("fetchContributors", contributor.ContributorTask) { + repoOwner.convention(providers.gradleProperty('githubOrg')) + repoName.convention(providers.gradleProperty('githubProject')) + githubToken.convention(providers.environmentVariable('GITHUB_TOKEN')) + yamlOutput.convention(layout.buildDirectory.file("generated/contributors.yml")) +} + +extensions.add("contributorsData", fetchContributors.flatMap { it.contributors }) diff --git a/build-logic/src/main/groovy/contributor/ContributorTask.groovy b/build-logic/src/main/groovy/contributor/ContributorTask.groovy new file mode 100644 index 0000000..9ea8031 --- /dev/null +++ b/build-logic/src/main/groovy/contributor/ContributorTask.groovy @@ -0,0 +1,95 @@ +package contributor + +import groovy.json.JsonOutput +import groovy.json.JsonSlurper +import groovy.yaml.YamlSlurper + +import org.gradle.api.DefaultTask +import org.gradle.api.file.RegularFileProperty +import org.gradle.api.provider.Property +import org.gradle.api.provider.Provider +import org.gradle.api.tasks.Input +import org.gradle.api.tasks.Internal +import org.gradle.api.tasks.Optional +import org.gradle.api.tasks.OutputFile +import org.gradle.api.tasks.TaskAction +import org.gradle.internal.impldep.org.testng.internal.YamlParser + +abstract class ContributorTask extends DefaultTask { + + @Input + abstract Property getRepoOwner() + + @Input + abstract Property getRepoName() + + @Input + @Optional + abstract Property getGithubToken() + + @OutputFile + abstract RegularFileProperty getYamlOutput() + + @Internal + Provider> getContributors() { + yamlOutput.map { regularFile -> + def yamlFile = regularFile.asFile + if (!yamlFile.exists()) return Collections. emptyMap() + yamlFile.readLines() + .findAll { it.startsWith(' ') && it.contains(': ') } + .collectEntries { line -> + def colon = line.indexOf(': ') + def key = line.substring(2, colon) + def raw = line.substring(colon + 2).trim() + def val = (raw.startsWith("'") && raw.endsWith("'")) ? raw[1..-2].replace("''", "'") : raw + [(key): val] + } as Map + } + } + + @TaskAction + void generate() { + def token = githubToken.orNull + def outputFile = yamlOutput.get().asFile + outputFile.parentFile.mkdirs() + + if (!token) { + logger.warn("No GITHUB_TOKEN — skipping contributor fetch for ${repoOwner.get()}/${repoName.get()}") + outputFile.text = "contributors:\n" + return + } + + // 1. Fetch from REST (sorted by contributions, bots excluded) + def restUrl = "https://api.github.com/repos/${repoOwner.get()}/${repoName.get()}/contributors" + def contributors = new JsonSlurper().parseText( + restUrl.toURL().getText(requestProperties: [Authorization: "token $token"]) + ).findAll { it.type != 'Bot' } as List> + + def sortedNodes = contributors*.node_id + def loginMap = contributors.collectEntries { [it.node_id, it.login] } as Map + + // 2. Fetch display names via GraphQL + def gqlQuery = 'query($ids: [ID!]!) { nodes(ids: $ids) { ... on User { id name login } } }' + def body = JsonOutput.toJson([query: gqlQuery, variables: [ids: sortedNodes]]) + + def connection = "https://api.github.com/graphql".toURL().openConnection() as HttpURLConnection + connection.with { + doOutput = true + requestMethod = 'POST' + setRequestProperty('Authorization', "bearer $token") + outputStream.withWriter { it << body } + } + + def gqlResponse = new JsonSlurper().parseText(connection.inputStream.text) + def nameLookup = gqlResponse.data.nodes.collectEntries { [it.id, it.name ?: it.login] } as Map + + // 3. Write YAML output (login → display name, preserving contribution order) + def finalMap = sortedNodes + .findAll { loginMap[it] } + .collectEntries { id -> [loginMap[id], nameLookup[id] ?: loginMap[id]] } as Map + + outputFile.text = "contributors:\n" + finalMap.collect { k, v -> + " $k: '${v.replace("'", "''")}'" + }.join("\n") + } +} diff --git a/plugin/build.gradle b/plugin/build.gradle index dd6516d..3a04216 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -1,8 +1,11 @@ +import org.gradle.api.publish.maven.tasks.GenerateMavenPom + plugins { id 'config.compile' id 'config.grails-plugin' id 'config.publish' id 'config.testing' + id 'config.contributors' } version = projectVersion @@ -36,8 +39,6 @@ dependencies { } extensions.configure(org.apache.grails.gradle.publish.GrailsPublishExtension) { - def githubUser = rootProject.findProperty('githubOrg') - def githubProject = rootProject.findProperty('githubProject') it.artifactId = project.name it.githubSlug = "${githubOrg}/${githubProject}" it.license.name = 'Apache-2.0' @@ -47,20 +48,20 @@ extensions.configure(org.apache.grails.gradle.publish.GrailsPublishExtension) { it.name = "${projectOrg}" it.url = "https://github.com/${githubOrg}" } - it.developers = [ - graemerocher:'Graeme Rocher', - puneetbehl: 'Puneet Behl', - nwwells: 'Nathan Wells', - tulu: 'Ruben', - arturoojeda: 'Arturo Ojeda López', - fabiooshiro: 'Fabio Issamu Oshiro', - ddelponte: 'Dean Del Ponte', - cristallo: 'Cristiano Limiti', - mirweb: 'Mirko Weber', - joasgarcia: 'Joás Garcia', - frangarcia: 'Fran García', - dustindclark: 'Dustin Clark', - miq: 'Mihael Koep', - sbglasius: 'Søren Berg Glasius' - ] +} + +pluginManager.withPlugin('maven-publish') { + tasks.withType(GenerateMavenPom).configureEach { pomTask -> + dependsOn(tasks.named('fetchContributors')) + doFirst { + pomTask.pom.developers { spec -> + contributorsData.get().each { String login, String displayName -> + spec.developer { + id = login + name = displayName + } + } + } + } + } } From e5c1e29f03f46d7403c3f77c95772e1ca8e9bf73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Berg=20Glasius?= Date: Mon, 4 May 2026 23:46:51 +0200 Subject: [PATCH 5/6] chore: Replaced hardcoded YAML with Groovy YamlBuilder and YamlSlurper --- build-logic/build.gradle | 1 + .../groovy/contributor/ContributorTask.groovy | 19 ++++++------------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/build-logic/build.gradle b/build-logic/build.gradle index 746607d..d1bf315 100644 --- a/build-logic/build.gradle +++ b/build-logic/build.gradle @@ -20,6 +20,7 @@ allprojects { project -> dependencies { implementation platform("org.apache.grails:grails-bom:${gradleProperties.grailsVersion}") + implementation 'org.apache.groovy:groovy-yaml' implementation 'cloud.wondrify:asset-pipeline-gradle' implementation "com.adarshr:gradle-test-logger-plugin:${gradleProperties.testLoggerVersion}" implementation 'org.apache.grails:grails-gradle-plugins' diff --git a/build-logic/src/main/groovy/contributor/ContributorTask.groovy b/build-logic/src/main/groovy/contributor/ContributorTask.groovy index 9ea8031..580f364 100644 --- a/build-logic/src/main/groovy/contributor/ContributorTask.groovy +++ b/build-logic/src/main/groovy/contributor/ContributorTask.groovy @@ -2,6 +2,7 @@ package contributor import groovy.json.JsonOutput import groovy.json.JsonSlurper +import groovy.yaml.YamlBuilder import groovy.yaml.YamlSlurper import org.gradle.api.DefaultTask @@ -13,7 +14,6 @@ import org.gradle.api.tasks.Internal import org.gradle.api.tasks.Optional import org.gradle.api.tasks.OutputFile import org.gradle.api.tasks.TaskAction -import org.gradle.internal.impldep.org.testng.internal.YamlParser abstract class ContributorTask extends DefaultTask { @@ -35,15 +35,8 @@ abstract class ContributorTask extends DefaultTask { yamlOutput.map { regularFile -> def yamlFile = regularFile.asFile if (!yamlFile.exists()) return Collections. emptyMap() - yamlFile.readLines() - .findAll { it.startsWith(' ') && it.contains(': ') } - .collectEntries { line -> - def colon = line.indexOf(': ') - def key = line.substring(2, colon) - def raw = line.substring(colon + 2).trim() - def val = (raw.startsWith("'") && raw.endsWith("'")) ? raw[1..-2].replace("''", "'") : raw - [(key): val] - } as Map + def yaml = new YamlSlurper().parse(yamlFile) as Map + yaml.contributors as Map } } @@ -88,8 +81,8 @@ abstract class ContributorTask extends DefaultTask { .findAll { loginMap[it] } .collectEntries { id -> [loginMap[id], nameLookup[id] ?: loginMap[id]] } as Map - outputFile.text = "contributors:\n" + finalMap.collect { k, v -> - " $k: '${v.replace("'", "''")}'" - }.join("\n") + YamlBuilder yaml = new YamlBuilder() + yaml contributors: finalMap + outputFile.text = yaml.toString() } } From 7cac29ea02b38625446f2df2dfa05b1d6bebcc19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Berg=20Glasius?= Date: Mon, 4 May 2026 23:52:26 +0200 Subject: [PATCH 6/6] chore: Fixed potential NPEs --- .../src/main/groovy/contributor/ContributorTask.groovy | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/build-logic/src/main/groovy/contributor/ContributorTask.groovy b/build-logic/src/main/groovy/contributor/ContributorTask.groovy index 580f364..cb2b856 100644 --- a/build-logic/src/main/groovy/contributor/ContributorTask.groovy +++ b/build-logic/src/main/groovy/contributor/ContributorTask.groovy @@ -34,9 +34,9 @@ abstract class ContributorTask extends DefaultTask { Provider> getContributors() { yamlOutput.map { regularFile -> def yamlFile = regularFile.asFile - if (!yamlFile.exists()) return Collections. emptyMap() + if (!yamlFile.exists()) return Collections.emptyMap() def yaml = new YamlSlurper().parse(yamlFile) as Map - yaml.contributors as Map + (yaml.contributors ?: [:]) as Map } } @@ -48,7 +48,9 @@ abstract class ContributorTask extends DefaultTask { if (!token) { logger.warn("No GITHUB_TOKEN — skipping contributor fetch for ${repoOwner.get()}/${repoName.get()}") - outputFile.text = "contributors:\n" + YamlBuilder emptyYaml = new YamlBuilder() + emptyYaml contributors: [:] + outputFile.text = emptyYaml.toString() return }