Skip to content

Commit 13862a4

Browse files
authored
Merge pull request #13968 from jdaugherty/7.0.x
Remove grails gradle plugin usage since the plugins are not full grails apps
2 parents 099c51a + 7f362e6 commit 13862a4

File tree

5 files changed

+5
-40
lines changed

5 files changed

+5
-40
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ subprojects { subproject ->
260260
uri('https://repo.grails.org/grails/plugins3-snapshots-local') :
261261
uri('https://repo.grails.org/grails/libs-snapshots-local')
262262
} else {
263-
url 'https://maven.pkg.github.com/grails/grails-core'
263+
url('https://maven.pkg.github.com/grails/grails-core')
264264
}
265265
}
266266
}

grails-async/plugin/build.gradle

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
buildscript {
2-
repositories {
3-
maven { url = 'https://repo.grails.org/grails/core' }
4-
}
5-
dependencies {
6-
classpath "org.grails:grails-gradle-plugin:${project['grails-gradle-plugin.version']}"
7-
}
8-
}
9-
10-
apply plugin: 'org.grails.grails-web'
11-
apply plugin: 'org.grails.grails-plugin'
12-
131
dependencies {
142
implementation platform(project(':grails-bom'))
153

grails-docs/src/main/groovy/grails/doc/asciidoc/AsciiDocEngine.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ class AsciiDocEngine extends DocEngine {
2525
]
2626
@Override
2727
String render(String content, RenderContext context) {
28+
Attributes attrs = Attributes.builder().build()
29+
attrs.setAttributes(attributes)
30+
2831
def optionsBuilder = Options.builder()
2932
.standalone(false)
30-
.attributes(Attributes.builder()
31-
.imagesDir(attributes['imagesdir'])
32-
.sourceHighlighter(attributes[ 'source-highlighter'])
33-
.icons('icons').build())
33+
.attributes(attrs)
3434

3535
if (attributes.containsKey('safe')) {
3636
optionsBuilder.safe(SafeMode.valueOf(attributes.get('safe').toString()))

grails-events/plugin/build.gradle

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
1-
buildscript {
2-
repositories {
3-
maven { url = 'https://repo.grails.org/grails/core' }
4-
}
5-
dependencies {
6-
classpath "org.grails:grails-gradle-plugin:${project['grails-gradle-plugin.version']}"
7-
}
8-
}
9-
101
plugins {
112
id 'groovy'
123
id 'java'
134
id 'java-library'
145
}
156

16-
apply plugin: 'org.grails.grails-plugin'
17-
187
dependencies {
198
implementation platform(project(':grails-bom'))
209

grails-plugin-converters/build.gradle

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,8 @@
1-
import org.springframework.boot.gradle.tasks.bundling.BootJar
2-
3-
buildscript {
4-
repositories {
5-
maven { url = 'https://repo.grails.org/grails/core' }
6-
}
7-
dependencies {
8-
classpath "org.grails:grails-gradle-plugin:${project['grails-gradle-plugin.version']}"
9-
}
10-
}
11-
121
group = 'org.grails.plugins'
132
version = projectVersion
143

154
apply plugin: 'groovy'
165
apply plugin: 'java-library'
17-
apply plugin: 'org.grails.grails-plugin'
186

197
dependencies {
208
implementation platform(project(':grails-bom'))

0 commit comments

Comments
 (0)