fix: Groovy 3.0.20 compatibility (#13371)

grails · Jan 26, 2024 · a58ae33 · a58ae33
1 parent 228500a
commit a58ae33
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/grails-shell/src/main/groovy/org/grails/cli/GrailsCli.groovy b/grails-shell/src/main/groovy/org/grails/cli/GrailsCli.groovy
@@ -27,6 +27,7 @@ import groovy.transform.CompileStatic
 import jline.UnixTerminal
 import jline.console.UserInterruptException
 import jline.console.completer.ArgumentCompleter
+import jline.console.completer.Completer
 import jline.internal.NonBlockingInputStream
 import org.gradle.tooling.BuildActionExecuter
 import org.gradle.tooling.BuildCancelledException
@@ -417,7 +418,7 @@ class GrailsCli {
                 new RegexCompletor("!\\w+"), new EscapingFileNameCompletor())
         )
 
-        completers.addAll((profile.getCompleters(projectContext) ?: []) as Collection)
+        completers.addAll((profile.getCompleters(projectContext) ?: []) as Collection<Completer>)
         consoleReader.addCompleter(aggregateCompleter)
         return console
     }

diff --git a/grails-shell/src/main/groovy/org/grails/cli/profile/AbstractProfile.groovy b/grails-shell/src/main/groovy/org/grails/cli/profile/AbstractProfile.groovy
@@ -166,8 +166,8 @@ abstract class AbstractProfile implements Profile {
                 }
             }
 
-            defaultFeaturesNames.addAll(defaultFeatures)
-            requiredFeatureNames.addAll(requiredFeatures)
+            defaultFeaturesNames.addAll(defaultFeatures as Set<String>)
+            requiredFeatureNames.addAll(requiredFeatures as Set<String>)
         }
 
 

diff --git a/.../main/groovy/org/grails/web/databinding/converters/AbstractStructuredBindingEditor.groovy b/.../main/groovy/org/grails/web/databinding/converters/AbstractStructuredBindingEditor.groovy
@@ -73,6 +73,6 @@ abstract class AbstractStructuredBindingEditor<T> implements TypedStructuredBind
                 valuesMap[propName] = bindingSource.getPropertyValue(key)
             }
         }
-        valuesMap
+        valuesMap as Map<String, Object>
     }
 }