From e55f5e563d78249a3c42ef4cfd1fb8ef19c3dda4 Mon Sep 17 00:00:00 2001 From: Mattias Reichel Date: Fri, 1 Dec 2023 14:44:16 +0100 Subject: [PATCH 1/3] Upgrade to Groovy 3.0.19 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6870df577..6ec80805f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ githubSlug=grails/grails-views gormVersion=8.0.1 grailsVersion=6.1.0 grailsGradlePluginVersion=6.1.0 -groovyVersion=3.0.11 +groovyVersion=3.0.19 hibernateGormVersion=8.0.0 jansiVersion=2.4.1 javaParserCoreVersion=3.15.14 From 6ca9c45e3e7dc15aed1bffc990554dc0ccc4b422 Mon Sep 17 00:00:00 2001 From: Mattias Reichel Date: Fri, 1 Dec 2023 14:44:38 +0100 Subject: [PATCH 2/3] Make project compatible with Groovy 3.0.19 --- .../grails/plugin/json/view/test/TestRequestConfigurer.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/json/src/main/groovy/grails/plugin/json/view/test/TestRequestConfigurer.groovy b/json/src/main/groovy/grails/plugin/json/view/test/TestRequestConfigurer.groovy index b56f3b144..754f6f525 100644 --- a/json/src/main/groovy/grails/plugin/json/view/test/TestRequestConfigurer.groovy +++ b/json/src/main/groovy/grails/plugin/json/view/test/TestRequestConfigurer.groovy @@ -26,7 +26,7 @@ class TestRequestConfigurer implements Request { String contentType = 'application/json' String characterEncoding = 'UTF-8' Map> headers = new LinkedHashMap>().withDefault { String name -> - return [] + return [] as List } Map attributes = new LinkedHashMap() From 29cd1bca3d072fe44fa2401e27a77f13426b4eeb Mon Sep 17 00:00:00 2001 From: Mattias Reichel Date: Thu, 7 Dec 2023 14:36:34 +0100 Subject: [PATCH 3/3] Revert to Groovy 3.0.11 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6ec80805f..6870df577 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ githubSlug=grails/grails-views gormVersion=8.0.1 grailsVersion=6.1.0 grailsGradlePluginVersion=6.1.0 -groovyVersion=3.0.19 +groovyVersion=3.0.11 hibernateGormVersion=8.0.0 jansiVersion=2.4.1 javaParserCoreVersion=3.15.14