Merge pull request #13968 from jdaugherty/7.0.x

Remove grails gradle plugin usage since the plugins are not full grails apps
grails · Jan 11, 2025 · 13862a4 · 13862a4
2 parents 099c51a + 7f362e6
commit 13862a4
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 40 deletions.
diff --git 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')
                         }
                     }
                 }

diff --git 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-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()))

diff --git 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
@@ -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'))