From dcd12c1c8d4c5194b5a4f4a66601fb5e408feef4 Mon Sep 17 00:00:00 2001 From: Puneet Behl Date: Tue, 12 Oct 2021 21:50:28 +0530 Subject: [PATCH] Make Gradle 7.2 compatible Correctly define @Input annotation on Task input Fixes grails/grails-core#12132 --- .../groovy/grails/views/gradle/ViewCompileOptions.groovy | 8 +++++++- .../grails/views/gradle/json/JsonViewCompilerTask.groovy | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gradle/src/main/groovy/grails/views/gradle/ViewCompileOptions.groovy b/gradle/src/main/groovy/grails/views/gradle/ViewCompileOptions.groovy index c15cec17b..ecb0292e0 100644 --- a/gradle/src/main/groovy/grails/views/gradle/ViewCompileOptions.groovy +++ b/gradle/src/main/groovy/grails/views/gradle/ViewCompileOptions.groovy @@ -1,15 +1,21 @@ package grails.views.gradle +import org.gradle.api.tasks.Input +import org.gradle.api.tasks.Nested import org.gradle.api.tasks.compile.GroovyForkOptions /** * @author Graeme Rocher * @since 1.0 */ -class ViewCompileOptions { +class ViewCompileOptions implements Serializable { + private static final long serialVersionUID = 0L; + + @Input String encoding = "UTF-8" + @Nested GroovyForkOptions forkOptions = new GroovyForkOptions() } diff --git a/gradle/src/main/groovy/grails/views/gradle/json/JsonViewCompilerTask.groovy b/gradle/src/main/groovy/grails/views/gradle/json/JsonViewCompilerTask.groovy index a8499a072..318159bc1 100644 --- a/gradle/src/main/groovy/grails/views/gradle/json/JsonViewCompilerTask.groovy +++ b/gradle/src/main/groovy/grails/views/gradle/json/JsonViewCompilerTask.groovy @@ -2,6 +2,7 @@ package grails.views.gradle.json import grails.views.gradle.AbstractGroovyTemplateCompileTask import groovy.transform.CompileStatic +import org.gradle.api.tasks.Input /** * Concrete implementation that compiles JSON templates @@ -11,16 +12,19 @@ import groovy.transform.CompileStatic @CompileStatic class JsonViewCompilerTask extends AbstractGroovyTemplateCompileTask { + @Input @Override String getFileExtension() { "gson" } + @Input @Override String getScriptBaseName() { "grails.plugin.json.view.JsonViewTemplate" } + @Input @Override protected String getCompilerName() { "grails.plugin.json.view.JsonViewCompiler"