fix: refactor gradle resolution into versionsresolver - #447
Merged
cdsap merged 1 commit intoSep 5, 2026
Conversation
cdsap
deleted the
issue/446-hermes-refactor-gradle-resolution-into-vers-a1
branch
September 5, 2026 18:53
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Problem
Gradle wrapper version precedence (CLI
--gradle>versions.yaml>Gradle.latest()) lives inresolveGradle()insidecli/src/main/kotlin/io/github/cdsap/projectgenerator/cli/GenerateProjectRequest.kt, while dependency/plugin versions are resolved incli/src/main/kotlin/io/github/cdsap/projectgenerator/cli/VersionsResolver.kt. Both consume the sameVersionsFileand CLI inputs, but configuration resolution is split across two application-layer types, with Gradle precedence tests incli/src/test/kotlin/io/github/cdsap/projectgenerator/cli/GenerateProjectsCliTest.ktinstead ofVersionsResolverTest.kt.Why this matters
The split boundary makes precedence rules easy to update inconsistently and scatters related tests.
GenerateProjectRequest.resolve()should orchestrate inputs and outputs, not own every merge policy for values that already come from the same versions file.Proposed change
Move
resolveGradle(cliGradle, versionsFile)intoVersionsResolver(e.g.fun resolveGradle(cliGradle: String?, fileVersions: VersionsFile?): Gradle), delete the standalone helper fromGenerateProjectRequest.kt, and callVersionsResolver.resolveGradle(...)fromGenerateProjectRequest.resolve(). Move the three Gradle precedence tests fromGenerateProjectsCliTest.kttoVersionsResolverTest.kt. No behavior or public CLI surface changes.Notes
DDD/clean-architecture lens: treat
VersionsResolveras the application service for configuration merging (infrastructure YAML + CLI adapter inputs → domainVersions/Gradle), and keepGenerateProjectRequestas a thin use-case assembler. This is a behavior-preserving extraction aligned with the existingVersionsOverrides.applyTopattern.Fixes #446
Changes
cli/src/main/kotlin/io/github/cdsap/projectgenerator/cli/GenerateProjectRequest.ktcli/src/main/kotlin/io/github/cdsap/projectgenerator/cli/VersionsResolver.ktcli/src/test/kotlin/io/github/cdsap/projectgenerator/cli/GenerateProjectsCliTest.ktcli/src/test/kotlin/io/github/cdsap/projectgenerator/cli/VersionsResolverTest.ktVerification
./gradlew :project-generator:unitTest./gradlew :cli:test./gradlew ktlintCheck