From 37ae7de1644f966c6432315b42d6414a3f7e2fd2 Mon Sep 17 00:00:00 2001 From: James Daugherty Date: Fri, 10 Jan 2025 14:38:07 -0500 Subject: [PATCH 1/3] Remove grails gradle plugin usage since the plugins are not full grails apps --- grails-async/plugin/build.gradle | 12 ------------ grails-events/plugin/build.gradle | 11 ----------- grails-plugin-converters/build.gradle | 12 ------------ 3 files changed, 35 deletions(-) diff --git a/grails-async/plugin/build.gradle b/grails-async/plugin/build.gradle index fa049c740b4..656fab03a08 100644 --- a/grails-async/plugin/build.gradle +++ b/grails-async/plugin/build.gradle @@ -1,15 +1,3 @@ -buildscript { - repositories { - maven { url = 'https://repo.grails.org/grails/core' } - } - dependencies { - classpath "org.grails:grails-gradle-plugin:${project['grails-gradle-plugin.version']}" - } -} - -apply plugin: 'org.grails.grails-web' -apply plugin: 'org.grails.grails-plugin' - dependencies { implementation platform(project(':grails-bom')) diff --git a/grails-events/plugin/build.gradle b/grails-events/plugin/build.gradle index 40504268350..a1a08101586 100644 --- a/grails-events/plugin/build.gradle +++ b/grails-events/plugin/build.gradle @@ -1,20 +1,9 @@ -buildscript { - repositories { - maven { url = 'https://repo.grails.org/grails/core' } - } - dependencies { - classpath "org.grails:grails-gradle-plugin:${project['grails-gradle-plugin.version']}" - } -} - plugins { id 'groovy' id 'java' id 'java-library' } -apply plugin: 'org.grails.grails-plugin' - dependencies { implementation platform(project(':grails-bom')) diff --git a/grails-plugin-converters/build.gradle b/grails-plugin-converters/build.gradle index ca35cc34c56..c78b8056641 100644 --- a/grails-plugin-converters/build.gradle +++ b/grails-plugin-converters/build.gradle @@ -1,20 +1,8 @@ -import org.springframework.boot.gradle.tasks.bundling.BootJar - -buildscript { - repositories { - maven { url = 'https://repo.grails.org/grails/core' } - } - dependencies { - classpath "org.grails:grails-gradle-plugin:${project['grails-gradle-plugin.version']}" - } -} - group = 'org.grails.plugins' version = projectVersion apply plugin: 'groovy' apply plugin: 'java-library' -apply plugin: 'org.grails.grails-plugin' dependencies { implementation platform(project(':grails-bom')) From 999b784ed1ef82b1200062a9906533cca5b74add Mon Sep 17 00:00:00 2001 From: James Daugherty Date: Fri, 10 Jan 2025 21:43:29 -0500 Subject: [PATCH 2/3] Fix properties being passed to grails docs --- .../main/groovy/grails/doc/asciidoc/AsciiDocEngine.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/grails-docs/src/main/groovy/grails/doc/asciidoc/AsciiDocEngine.groovy b/grails-docs/src/main/groovy/grails/doc/asciidoc/AsciiDocEngine.groovy index 2833e678ff6..b11241d31bf 100644 --- a/grails-docs/src/main/groovy/grails/doc/asciidoc/AsciiDocEngine.groovy +++ b/grails-docs/src/main/groovy/grails/doc/asciidoc/AsciiDocEngine.groovy @@ -25,12 +25,12 @@ class AsciiDocEngine extends DocEngine { ] @Override String render(String content, RenderContext context) { + Attributes attrs = Attributes.builder().build() + attrs.setAttributes(attributes) + def optionsBuilder = Options.builder() .standalone(false) - .attributes(Attributes.builder() - .imagesDir(attributes['imagesdir']) - .sourceHighlighter(attributes[ 'source-highlighter']) - .icons('icons').build()) + .attributes(attrs) if (attributes.containsKey('safe')) { optionsBuilder.safe(SafeMode.valueOf(attributes.get('safe').toString())) From 7f362e6bbbe7a5a19f75eecafdb304dd468c7af4 Mon Sep 17 00:00:00 2001 From: James Daugherty Date: Fri, 10 Jan 2025 21:49:15 -0500 Subject: [PATCH 3/3] feedback: use uri() instead of uri property setter --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e372c1a515a..7e2e1f0bc23 100644 --- a/build.gradle +++ b/build.gradle @@ -260,7 +260,7 @@ subprojects { subproject -> uri('https://repo.grails.org/grails/plugins3-snapshots-local') : uri('https://repo.grails.org/grails/libs-snapshots-local') } else { - url 'https://maven.pkg.github.com/grails/grails-core' + url('https://maven.pkg.github.com/grails/grails-core') } } }