Skip to content

Commit cd8db8a

Browse files
fix: address code review feedback in Gradle migration
- Move rootProject.name after pluginManagement{} in settings.gradle.kts (Gradle 8 requirement) - Add pluggable-storage project to client shadowJar dependencies block to match Maven shade config - Remove no-op jedis relocate in redis-wrapper, replace with explanatory comment - Fix CI concurrency group to include github.ref and fallback sha for non-PR runs Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 69dd0bb commit cd8db8a

4 files changed

Lines changed: 5 additions & 4 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
- development
1111

1212
concurrency:
13-
group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
13+
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.pull_request.number || github.sha }}
1414
cancel-in-progress: true
1515

1616
jobs:

client/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ tasks.shadowJar {
4747

4848
// Include only specific artifacts in the shadow jar
4949
dependencies {
50+
include(dependency(project(":pluggable-storage")))
5051
include(dependency("com.google.guava:guava"))
5152
include(dependency("com.google.code.gson:gson"))
5253
include(dependency("org.yaml:snakeyaml"))

redis-wrapper/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies {
1717

1818
tasks.shadowJar {
1919
mergeServiceFiles()
20-
relocate("redis.clients.jedis", "redis.clients.jedis") // passthrough relocation
20+
// jedis is intentionally NOT relocated — consumers depend on redis.clients.jedis types directly
2121
exclude(
2222
"META-INF/license/**",
2323
"META-INF/*",

settings.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
rootProject.name = "java-client"
2-
31
pluginManagement {
42
repositories {
53
gradlePluginPortal()
64
mavenCentral()
75
}
86
}
97

8+
rootProject.name = "java-client"
9+
1010
dependencyResolutionManagement {
1111
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
1212
versionCatalogs {

0 commit comments

Comments
 (0)