Skip to content

Commit 1095028

Browse files
rainboyanrainboyan
committed
Merge grace-views into the framework
- Merge grace-views-gradle into grace-gradle-plugin - Merge grace-views-json-testing-support into grace-test-support - Update Gradle build script - Update ViewsTransform JsonViewsTransform MarkupViewsTransform MarkupViewTemplateEngine - Make tests works Closes gh-1215
1 parent e8ac2f0 commit 1095028

38 files changed

Lines changed: 156 additions & 142 deletions

File tree

‎grace-gradle-plugin/build.gradle‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,20 @@ gradlePlugin {
9393
tags.set(['groovy', 'grace-framework', 'spring-boot'])
9494
implementationClass = 'org.grails.gradle.plugin.web.GrailsWebGradlePlugin'
9595
}
96+
graceViewsJson {
97+
displayName = "Grace Json Views Gradle Plugin"
98+
description = 'The Gradle plugin for Json Views'
99+
id = 'org.graceframework.grace-json'
100+
tags.set(['groovy', 'grace-framework', 'spring-boot'])
101+
implementationClass = 'org.grails.gradle.plugin.web.views.json.GrailsJsonViewsPlugin'
102+
}
103+
graceViewsMarkup {
104+
displayName = "Grace Markup Views Gradle Plugin"
105+
description = 'The Gradle plugin for Markup Views'
106+
id = 'org.graceframework.grace-markup'
107+
tags.set(['groovy', 'grace-framework', 'spring-boot'])
108+
implementationClass = 'org.grails.gradle.plugin.web.views.markup.GrailsMarkupViewsPlugin'
109+
}
96110
}
97111
}
98112

grace-views-gradle/src/main/groovy/grails/views/gradle/AbstractGroovyTemplateCompileTask.groovy renamed to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/views/AbstractGroovyTemplateCompileTask.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package grails.views.gradle
1+
package org.grails.gradle.plugin.web.views
22

33
import javax.inject.Inject
44

@@ -17,13 +17,13 @@ import org.gradle.process.ExecOperations
1717
import org.gradle.process.JavaExecSpec
1818
import org.gradle.work.InputChanges
1919

20-
import grails.views.gradle.util.SourceSets
20+
import org.grails.gradle.plugin.web.views.util.SourceSets
2121

2222
/**
2323
* Abstract Gradle task for compiling templates, using GenericGroovyTemplateCompiler
2424
*
2525
* @author Graeme Rocher
26-
* @since 1.0
26+
* @since 2024.0.0
2727
*/
2828
@CompileStatic
2929
abstract class AbstractGroovyTemplateCompileTask extends AbstractCompile {

grace-views-gradle/src/main/groovy/grails/views/gradle/AbstractGroovyTemplatePlugin.groovy renamed to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/views/AbstractGroovyTemplatePlugin.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package grails.views.gradle
1+
package org.grails.gradle.plugin.web.views
22

33
import grails.util.GrailsNameUtils
44
import groovy.transform.CompileDynamic
@@ -15,15 +15,15 @@ import org.gradle.api.tasks.SourceSetOutput
1515
import org.gradle.api.tasks.bundling.Jar
1616
import org.gradle.api.tasks.bundling.War
1717

18-
import grails.views.gradle.util.SourceSets
18+
import org.grails.gradle.plugin.web.views.util.SourceSets
1919

2020
import org.grails.gradle.plugin.core.GrailsExtension
2121

2222
/**
2323
* Abstract implementation of a plugin that compiles views
2424
*
2525
* @author Graeme Rocher
26-
* @since 1.0
26+
* @since 2024.0.0
2727
*/
2828
@CompileStatic
2929
class AbstractGroovyTemplatePlugin implements Plugin<Project> {

grace-views-gradle/src/main/groovy/grails/views/gradle/ViewCompileOptions.groovy renamed to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/views/ViewCompileOptions.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package grails.views.gradle
1+
package org.grails.gradle.plugin.web.views
22

33
import javax.inject.Inject
44

@@ -10,7 +10,7 @@ import org.gradle.api.tasks.compile.GroovyForkOptions
1010

1111
/**
1212
* @author Graeme Rocher
13-
* @since 1.0
13+
* @since 2024.0.0
1414
*/
1515
class ViewCompileOptions extends AbstractOptions {
1616

grace-views-gradle/src/main/groovy/grails/views/gradle/json/GrailsJsonViewsPlugin.groovy renamed to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/views/json/GrailsJsonViewsPlugin.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package grails.views.gradle.json
1+
package org.grails.gradle.plugin.web.views.json
22

3-
import grails.views.gradle.AbstractGroovyTemplatePlugin
3+
import org.grails.gradle.plugin.web.views.AbstractGroovyTemplatePlugin
44
import groovy.transform.CompileStatic
55

66
/**
77
* Concrete implementation of plugin for JSON views
88
*
99
* @author Graeme Rocher
10-
* @since 1.0
10+
* @since 2024.0.0
1111
*/
1212
@CompileStatic
1313
class GrailsJsonViewsPlugin extends AbstractGroovyTemplatePlugin {

grace-views-gradle/src/main/groovy/grails/views/gradle/json/JsonViewCompilerTask.groovy renamed to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/views/json/JsonViewCompilerTask.groovy

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
package grails.views.gradle.json
1+
package org.grails.gradle.plugin.web.views.json
22

33
import javax.inject.Inject
44

55
import groovy.transform.CompileStatic
66
import org.gradle.api.tasks.Input
77
import org.gradle.process.ExecOperations
88

9-
import grails.views.gradle.AbstractGroovyTemplateCompileTask
9+
import org.grails.gradle.plugin.web.views.AbstractGroovyTemplateCompileTask
1010

1111
/**
1212
* Concrete implementation that compiles JSON templates
1313
*
1414
* @author Graeme Rocher
15+
* @since 2024.0.0
1516
*/
1617
@CompileStatic
1718
class JsonViewCompilerTask extends AbstractGroovyTemplateCompileTask {

grace-views-gradle/src/main/groovy/grails/views/gradle/markup/GrailsMarkupViewsPlugin.groovy renamed to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/views/markup/GrailsMarkupViewsPlugin.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package grails.views.gradle.markup
1+
package org.grails.gradle.plugin.web.views.json
22

3-
import grails.views.gradle.AbstractGroovyTemplatePlugin
4-
import grails.views.gradle.markup.MarkupViewCompilerTask
3+
import org.grails.gradle.plugin.web.views.AbstractGroovyTemplatePlugin
4+
import org.grails.gradle.plugin.web.views.markup.MarkupViewCompilerTask
55
import groovy.transform.CompileStatic
66

77
/**
88
* A plugin for compiling markup templates
99
*
1010
* @author Graeme Rocher
11-
* @since 1.0
11+
* @since 2024.0.0
1212
*/
1313
@CompileStatic
1414
class GrailsMarkupViewsPlugin extends AbstractGroovyTemplatePlugin {

grace-views-gradle/src/main/groovy/grails/views/gradle/markup/MarkupViewCompilerTask.groovy renamed to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/views/markup/MarkupViewCompilerTask.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
package grails.views.gradle.markup
1+
package org.grails.gradle.plugin.web.views.markup
22

33
import javax.inject.Inject
44

55
import groovy.transform.CompileStatic
66
import org.gradle.api.tasks.Input
77
import org.gradle.process.ExecOperations
88

9-
import grails.views.gradle.AbstractGroovyTemplateCompileTask
9+
import org.grails.gradle.plugin.web.views.AbstractGroovyTemplateCompileTask
1010

1111
/**
1212
* MarkupView compiler task for Gradle
1313
*
1414
* @author Graeme Rocher
15-
* @since 1.0
15+
* @since 2024.0.0
1616
*/
1717
@CompileStatic
1818
class MarkupViewCompilerTask extends AbstractGroovyTemplateCompileTask {

grace-views-gradle/src/main/groovy/grails/views/gradle/util/SourceSets.groovy renamed to grace-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/web/views/util/SourceSets.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package grails.views.gradle.util
16+
package org.grails.gradle.plugin.web.views.util
1717

1818
import groovy.transform.CompileStatic
1919
import org.gradle.api.GradleException
@@ -24,7 +24,7 @@ import org.gradle.api.tasks.SourceSetContainer
2424

2525
/**
2626
* @author Michael Yan
27-
* @since 5.0.0
27+
* @since 2024.0.0
2828
*/
2929
@CompileStatic
3030
class SourceSets {

‎grace-test-support/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ dependencies {
1010

1111
api libs.grace.async.core
1212
api project(":grace-plugin-gsp")
13+
api project(":grace-views-json")
1314
api project(":grace-web-gsp")
1415
api libs.groovy.test.junit5
1516
api libs.grace.datastore.gorm

0 commit comments

Comments
 (0)