Skip to content

Post review fixes #13

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.

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
merged 2 commits into from
Jun 18, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion functional-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ dependencies {
}

java {
sourceCompatibility = JavaVersion.toVersion("11")
sourceCompatibility = JavaVersion.toVersion(javaVersion)
}
tasks.withType(Test).configureEach {
useJUnitPlatform()
Expand Down
7 changes: 1 addition & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
projectVersion=6.0.0-SNAPSHOT
grailsVersion=6.2.3
javaVersion=17
asciidoctorGradlePluginVersion=4.0.4

grailsGradlePluginVersion=6.2.4
version=0.1
javaVersion=11
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This property is still unused.
If you want to use it, which is a good idea, you can do:
sourceCompatibility = JavaVersion.toVersion(javaVersion)
in the java extension configuration blocks (two places: java-config.gradle and functional-tests/build.gradle)


# This prevents the Grails Gradle Plugin from unnecessarily excluding slf4j-simple in the generated POMs
# https://github.com/grails/grails-gradle-plugin/issues/222
Expand Down
6 changes: 3 additions & 3 deletions gradle/buildsrc.libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
grails-gradle-plugin = '6.2.0'
nexus-publish-gradle-plugin = '1.3.0'
asciidoctor-gradle-plugin = '4.0.2'
grails-gradle-plugin = '6.2.4'
nexus-publish-gradle-plugin = '2.0.0'
asciidoctor-gradle-plugin = '4.0.4'

[libraries]
grails-gradle-plugin = { module = 'org.grails:grails-gradle-plugin', version.ref = 'grails-gradle-plugin' }
Expand Down
1 change: 0 additions & 1 deletion gradle/grails-plugin-config.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ tasks.named('bootJar') {
tasks.named('jar', Jar) {
enabled = true // Enable the jar task again, as the bootJar task has been disabled
archiveClassifier = '' // Remove '-plain' suffix from jar file name
exclude('_testemails', 'messages*.properties')
}
2 changes: 1 addition & 1 deletion gradle/java-config.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
java {
sourceCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.toVersion(javaVersion)
withSourcesJar()
withJavadocJar()
}
4 changes: 0 additions & 4 deletions gradle/publishing.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ publishing {
publications {
register('grailsPlugin', MavenPublication) {
from javaComponent.get()
versionMapping {
usage('java-api') { fromResolutionOf('runtimeClasspath') }
usage('java-runtime') { fromResolutionResult() }
}
pom {
name = 'Grails Cache Redis plugin'
description = 'Provides setup for Redis caching'
Expand Down
26 changes: 13 additions & 13 deletions src/main/groovy/grails/plugin/cache/redis/GrailsRedisCache.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ public class GrailsRedisCache implements GrailsCache {
/**
* Constructor.
*
* @param name cache name
* @param prefix prefix to use
* @param name cache name
* @param prefix prefix to use
* @param template Spring template
* @param ttl time to live for cache
* @param ttl time to live for cache
*/
public GrailsRedisCache(String name, CacheKeyPrefix prefix, RedisTemplate<? extends Object, ? extends Object> template, Long ttl) {
Assert.hasText(name, "non-empty cache name is required");
Expand Down Expand Up @@ -114,16 +114,16 @@ public T doInRedis(RedisConnection connection) throws DataAccessException {
}, true);
}

@Override
public <T> T get(final Object key, Callable<T> valueLoader) {
/*
* FIXME: I had to add this method override in order to satisfy
* the Spring Cache interface. It looks like this method signature
* including the Callable parameter was added sometime after the
* original cache-redis plugin was developed (?).
*/
return (T) this.get(key);
}
@Override
public <T> T get(final Object key, Callable<T> valueLoader) {
/*
* FIXME: I had to add this method override in order to satisfy
* the Spring Cache interface. It looks like this method signature
* including the Callable parameter was added sometime after the
* original cache-redis plugin was developed (?).
*/
return (T) this.get(key);
}

@SuppressWarnings("unchecked")
@Override
Expand Down
Loading