fix(deps): update dependency com.github.ben-manes.caffeine:caffeine t…

…o v3 (#13373) * Update actions/cache action to v4 (#13367) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update gspVersion to v6.1.3 (#13365) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency org.jsoup:jsoup to v1.17.2 (#13363) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency org.asciidoctor:asciidoctorj to v2.5.11 (#13361) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update grails-testing-support monorepo to v3.1.2 (#13364) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update datastoreVersion to v8.0.4 (#13360) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update plugin com.gradle.enterprise to v3.16.2 (#13366) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update apache-tomcat monorepo to v9.0.85 (#13359) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency org.grails:grails-datastore-gorm-hibernate5 to v8.0.3 (#13362) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix: Groovy 3.0.20 compatibility (#13371) * fix(deps): update dependency com.github.ben-manes.caffeine:caffeine to v3 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Mattias Reichel <[email protected]>
grails · Feb 27, 2024 · 53dbde3 · 53dbde3
1 parent a9eafe6
commit 53dbde3
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 14 deletions.
diff --git a/.github/workflows/groovy-joint-workflow.yml b/.github/workflows/groovy-joint-workflow.yml
@@ -43,7 +43,7 @@ jobs:
           distribution: 'adopt'
           java-version: '11.0.6'
       - name: Cache local Maven repository & Groovy
-        uses: actions/cache@v3
+        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4
         with:
           path: |
             ~/groovy
@@ -130,7 +130,7 @@ jobs:
           distribution: 'adopt'
           java-version: '17'
       - name: Cache local Maven repository & Groovy
-        uses: actions/cache@v3
+        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4
         with:
           path: |
             ~/groovy

diff --git a/gradle.properties b/gradle.properties
@@ -2,16 +2,16 @@ projectVersion=7.0.0-SNAPSHOT
 antVersion=1.10.14
 aspectjVersion=1.9.21
 asyncVersion=5.0.2
-caffeineVersion=2.9.3
+caffeineVersion=3.1.8
 cglibVersion=2.2.2
 commonsLangVersion=2.6
-datastoreVersion=8.0.3
+datastoreVersion=8.0.4
 directoryWatcherVersion=0.9.9
 gdocEngineVersion=1.0.1
 gradleNexusPluginVersion=2.3.1
 gradleNexusStagingPluginVersion=0.12.0
 groovyVersion=3.0.11
-gspVersion=6.1.2
+gspVersion=6.1.3
 h2.version=2.2.224
 h2Version=2.2.224
 hibernateDatastoreVersion=8.0.2
@@ -43,7 +43,7 @@ springLoadedVersion=1.2.8.RELEASE
 springVersion=5.3.31
 spring.version=5.3.30
 testingSupportVersion=3.1.1
-testingSupportVersionForTests=3.1.1
+testingSupportVersionForTests=3.1.2
 tomcatLog4jVersion=8.5.2
 tomcatVersion=9.0.85
 viewsVersion=3.1.1

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/grails-test-suite-persistence/build.gradle b/grails-test-suite-persistence/build.gradle
@@ -16,7 +16,7 @@ dependencies {
                 project(':grails-spring')
 
     testImplementation "org.grails:grails-datastore-gorm-validation:$datastoreVersion"
-    testImplementation "org.grails:grails-datastore-gorm-hibernate5:8.0.2", {
+    testImplementation "org.grails:grails-datastore-gorm-hibernate5:8.0.3", {
         exclude group: 'org.grails', module:'grails-datastore-gorm'
         exclude group: 'org.grails', module:'grails-datastore-core'
         exclude group: 'org.springframework', module:'spring-core'

diff --git a/grails-test-suite-uber/build.gradle b/grails-test-suite-uber/build.gradle
@@ -28,7 +28,7 @@ dependencies {
                 project(":grails-plugin-databinding"),
                 project(':grails-spring')
 
-    testImplementation "org.grails:grails-datastore-gorm-hibernate5:8.0.2", {
+    testImplementation "org.grails:grails-datastore-gorm-hibernate5:8.0.3", {
         exclude group: 'org.grails', module:'grails-datastore-gorm'
         exclude group: 'org.grails', module:'grails-datastore-core'
         exclude group: 'org.springframework', module:'spring-core'

diff --git a/grails-test-suite-web/build.gradle b/grails-test-suite-web/build.gradle
@@ -29,7 +29,7 @@ dependencies {
                 project(':grails-spring')
     testImplementation "org.grails.plugins:converters:$legacyConvertersVersion"
 
-    testImplementation "org.grails:grails-datastore-gorm-hibernate5:8.0.2", {
+    testImplementation "org.grails:grails-datastore-gorm-hibernate5:8.0.3", {
         exclude group: 'org.grails', module:'grails-datastore-gorm'
         exclude group: 'org.grails', module:'grails-datastore-core'
         exclude group: 'org.springframework', module:'spring-core'

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>
     }
 }
diff --git a/settings.gradle b/settings.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.enterprise" version "3.16.1"
+    id "com.gradle.enterprise" version "3.16.2"
     id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.12.1'
 }