From 03a75c97b5b59cdc57e5a2f8feaac71a4a51523c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 26 Apr 2022 03:12:39 +0000 Subject: [PATCH 1/2] Update groovy monorepo to v3.0.10 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index f70f2473..00c0f8e5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ datastoreVersion=7.2.1 gebVersion=2.3 geckodriverVersion=0.23.0 grailsGradlePluginVersion=5.1.4 -groovyVersion=3.0.7 +groovyVersion=3.0.10 h2Version=1.4.200 hibernateCoreVersion=5.5.7.Final hibernatePluginVersion=7.2.2 From 59ed84cdb0a74deda2137c90b2f39279286f66cd Mon Sep 17 00:00:00 2001 From: Puneet Behl Date: Tue, 17 May 2022 08:12:57 +0530 Subject: [PATCH 2/2] Correctly apply CompileDynamic After upgrading to Groovy 3.0.10 some type conversion are causing compile time error. --- .../bson/codecs/decoders/BasicCollectionTypeDecoder.groovy | 2 ++ .../org/grails/datastore/gorm/mongo/simple/EnumType.groovy | 1 + 2 files changed, 3 insertions(+) diff --git a/grails-datastore-gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/BasicCollectionTypeDecoder.groovy b/grails-datastore-gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/BasicCollectionTypeDecoder.groovy index 0ab68d2b..1f76748f 100644 --- a/grails-datastore-gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/BasicCollectionTypeDecoder.groovy +++ b/grails-datastore-gorm-bson/src/main/groovy/org/grails/datastore/bson/codecs/decoders/BasicCollectionTypeDecoder.groovy @@ -1,5 +1,6 @@ package org.grails.datastore.bson.codecs.decoders +import groovy.transform.CompileDynamic import groovy.transform.CompileStatic import org.bson.BsonReader import org.bson.codecs.Codec @@ -19,6 +20,7 @@ import org.grails.datastore.mapping.model.types.Basic @CompileStatic class BasicCollectionTypeDecoder implements PropertyDecoder { + @CompileDynamic @Override void decode(BsonReader reader, Basic property, EntityAccess entityAccess, DecoderContext decoderContext, CodecRegistry codecRegistry) { CustomTypeMarshaller marshaller = property.customTypeMarshaller diff --git a/grails-datastore-gorm-mongodb/src/main/groovy/org/grails/datastore/gorm/mongo/simple/EnumType.groovy b/grails-datastore-gorm-mongodb/src/main/groovy/org/grails/datastore/gorm/mongo/simple/EnumType.groovy index 5fc53a9a..4099da86 100644 --- a/grails-datastore-gorm-mongodb/src/main/groovy/org/grails/datastore/gorm/mongo/simple/EnumType.groovy +++ b/grails-datastore-gorm-mongodb/src/main/groovy/org/grails/datastore/gorm/mongo/simple/EnumType.groovy @@ -155,6 +155,7 @@ class EnumType extends AbstractMappingAwareCustomTypeMarshaller