Skip to content

Fix Grails Forge build on Gradle 9 by bumping Shadow to 8.3.11 #16274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
codeconsole merged 2 commits into from
Aug 30, 2026
Merged

Fix Grails Forge build on Gradle 9 by bumping Shadow to 8.3.11 #16274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9918f53
Compile CodecMetaClassSupport statically
codeconsole Aug 30, 2026
6703374
Bump Forge Shadow plugin to 8.3.11 for Gradle 9
codeconsole Aug 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions grails-encoder/src/main/groovy/org/grails/encoder/CodecMetaClassSupport.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap
import com.github.benmanes.caffeine.cache.Cache
import com.github.benmanes.caffeine.cache.Caffeine

import groovy.transform.CompileDynamic
import groovy.transform.CompileStatic
import groovy.transform.EqualsAndHashCode
import org.codehaus.groovy.runtime.GStringImpl
Expand All @@ -39,6 +40,7 @@ import grails.util.GrailsMetaClassUtils
* @author Lari Hotari
* @since 2.3
*/
@CompileStatic
class CodecMetaClassSupport {

static final Object[] EMPTY_ARGS = []
Expand All @@ -53,7 +55,6 @@ class CodecMetaClassSupport {
*
* @param codecClass the codec class
*/
@CompileStatic
void configureCodecMethods(CodecFactory codecFactory, boolean cacheLookup = !Environment.getCurrent().isDevelopmentMode(), List<ExpandoMetaClass> targetMetaClasses = resolveDefaultMetaClasses()) {
Closure<String> encodeMethodNameClosure = { String codecName -> "${ENCODE_AS_PREFIX}${codecName}".toString() }
Closure<String> decodeMethodNameClosure = { String codecName -> "${DECODE_PREFIX}${codecName}".toString() }
Expand Down Expand Up @@ -133,12 +134,10 @@ class CodecMetaClassSupport {
* @param delegate
* @return
*/
@CompileStatic
private static Object filterNullObject(Object delegate) {
delegate != null && delegate.getClass() != NullObject ? delegate : null
}

@CompileStatic
private addAliasMetaMethods(List<ExpandoMetaClass> targetMetaClasses, Set<String> aliases, Closure<String> methodNameClosure, Closure methodClosure,
boolean cacheLookup, Set<MetaMethodRegistrationKey> registeredMetaMethodKeys) {
aliases?.each { String aliasName ->
Expand All @@ -162,6 +161,9 @@ class CodecMetaClassSupport {
}
}

// The metamethod name is only known at run time, and a GString property name is the one
// thing static compilation cannot express.
@CompileDynamic
protected void addMetaMethod(List<ExpandoMetaClass> targetMetaClasses, String methodName, Closure closure) {
targetMetaClasses.each { ExpandoMetaClass emc ->
emc."${methodName}" << closure
Expand All @@ -185,18 +187,15 @@ class CodecMetaClassSupport {
}
}

@CompileStatic
private static boolean shouldRegisterMetaMethod(ExpandoMetaClass emc, String methodName, Set<MetaMethodRegistrationKey> registeredMetaMethodKeys) {
MetaMethodRegistrationKey key = registrationKey(emc, methodName)
registeredMetaMethodKeys.add(key) || emc.getMetaMethod(methodName, EMPTY_ARGS) == null
}

@CompileStatic
private static MetaMethodRegistrationKey registrationKey(ExpandoMetaClass emc, String methodName) {
new MetaMethodRegistrationKey(emc.getTheClass(), methodName)
}

@CompileStatic
private static Set<MetaMethodRegistrationKey> registeredMetaMethodKeys(CodecFactory codecFactory) {
REGISTERED_META_METHODS.get(codecFactory) { CodecFactory ignored ->
Collections.newSetFromMap(new ConcurrentHashMap<MetaMethodRegistrationKey, Boolean>())
Expand Down
2 changes: 1 addition & 1 deletion grails-forge/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ postgresSocketFactoryVersion=1.17.1
picocliVersion=4.7.6
reflectionsVersion=0.10.2
rockerVersion=2.2.1
shadowVersion=8.3.6
shadowVersion=8.3.11
spotlessVersion=6.25.0
testcontainersVersion=1.20.4
testRetryVersion=1.6.2
Expand Down
Loading