Skip to content

fix: refactor gradle resolution into versionsresolver #447

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.

Sign up for GitHub

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
cdsap merged 1 commit into from
Sep 5, 2026
Merged

fix: refactor gradle resolution into versionsresolver #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 1 addition & 7 deletions cli/src/main/kotlin/io/github/cdsap/projectgenerator/cli/GenerateProjectRequest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ data class GenerateProjectRequest(
typeOfStringResources = typeOfStringResources,
layers = layers,
generateUnitTest = generateUnitTest,
gradle = resolveGradle(cliGradle, versionsFile),
gradle = VersionsResolver.resolveGradle(cliGradle, versionsFile),
projectRootPath = resolveProjectRootPath(outputDir, language, resolvedProjectName),
develocity = resolveDevelocityEnabled(develocityFlag, versionsOverrides.develocityUrl),
projectName = resolvedProjectName
Expand Down Expand Up @@ -135,9 +135,3 @@ internal fun resolveProjectRootPath(outputDir: String?, language: Language, proj
}
}
}

internal fun resolveGradle(cliGradle: String?, versionsFile: VersionsFile?): Gradle {
return cliGradle?.let(Gradle::fromValue)
?: versionsFile?.gradle
?: Gradle.latest()
}
7 changes: 7 additions & 0 deletions cli/src/main/kotlin/io/github/cdsap/projectgenerator/cli/VersionsResolver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package io.github.cdsap.projectgenerator.cli

import io.github.cdsap.projectgenerator.model.DependencyInjection
import io.github.cdsap.projectgenerator.model.Gradle
import io.github.cdsap.projectgenerator.model.Versions
import io.github.cdsap.projectgenerator.model.VersionsFile

Expand Down Expand Up @@ -37,4 +38,10 @@ object VersionsResolver {
val base = fileVersions?.resolve() ?: Versions()
return overrides.applyTo(base)
}

fun resolveGradle(cliGradle: String?, fileVersions: VersionsFile?): Gradle {
return cliGradle?.let(Gradle::fromValue)
?: fileVersions?.gradle
?: Gradle.latest()
}
}
23 changes: 0 additions & 23 deletions cli/src/test/kotlin/io/github/cdsap/projectgenerator/cli/GenerateProjectsCliTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import io.github.cdsap.projectgenerator.model.Language
import io.github.cdsap.projectgenerator.model.Shape
import io.github.cdsap.projectgenerator.model.TypeOfStringResources
import io.github.cdsap.projectgenerator.model.TypeProjectRequested
import io.github.cdsap.projectgenerator.model.VersionsFile
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Assertions.assertFalse
import org.junit.jupiter.api.Assertions.assertTrue
Expand Down Expand Up @@ -135,28 +134,6 @@ class GenerateProjectsCliTest {
assertTrue(error.message?.contains(Gradle.supportedDisplayValues()) == true)
}

@Test
fun `gradle from versions file is used when flag is absent`() {
val configured = Gradle.supported()[1]
val resolved = resolveGradle(null, VersionsFile(gradle = configured))

assertEquals(configured, resolved)
}

@Test
fun `gradle flag overrides versions file`() {
val resolved = resolveGradle(Gradle.latest().cliValue, VersionsFile(gradle = Gradle.oldest()))

assertEquals(Gradle.latest(), resolved)
}

@Test
fun `latest gradle is used when neither flag nor versions file provide one`() {
val resolved = resolveGradle(null, null)

assertEquals(Gradle.latest(), resolved)
}

@Test
fun `default output path for kts nests project name and project_kts`() {
val resolved = resolveProjectRootPath(null, Language.KTS, "sample")
Expand Down
26 changes: 26 additions & 0 deletions cli/src/test/kotlin/io/github/cdsap/projectgenerator/cli/VersionsResolverTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package io.github.cdsap.projectgenerator.cli

import io.github.cdsap.projectgenerator.model.Android
import io.github.cdsap.projectgenerator.model.DependencyInjection
import io.github.cdsap.projectgenerator.model.Gradle
import io.github.cdsap.projectgenerator.model.Project
import io.github.cdsap.projectgenerator.model.Versions
import io.github.cdsap.projectgenerator.model.VersionsFile
Expand Down Expand Up @@ -86,4 +87,29 @@ class VersionsResolverTest {
assertEquals("", resolved.project.develocityUrl)
assertEquals(DependencyInjection.METRO, resolved.di)
}

@Test
fun `gradle from versions file is used when flag is absent`() {
val configured = Gradle.supported()[1]
val resolved = VersionsResolver.resolveGradle(null, VersionsFile(gradle = configured))

assertEquals(configured, resolved)
}

@Test
fun `gradle flag overrides versions file`() {
val resolved = VersionsResolver.resolveGradle(
Gradle.latest().cliValue,
VersionsFile(gradle = Gradle.oldest())
)

assertEquals(Gradle.latest(), resolved)
}

@Test
fun `latest gradle is used when neither flag nor versions file provide one`() {
val resolved = VersionsResolver.resolveGradle(null, null)

assertEquals(Gradle.latest(), resolved)
}
}
Loading