Skip to content

Deduplicated version catalog entries #23

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
EranBoudjnah merged 1 commit into from
Oct 5, 2025
Merged

Deduplicated version catalog entries #23

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
10 changes: 6 additions & 4 deletions ...rc/main/kotlin/com/mitteloupe/cag/core/generation/versioncatalog/VersionCatalogUpdater.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,9 @@ class VersionCatalogUpdater(
val resolvedPluginIdToAliasMutable = existingPluginIdToAlias.toMutableMap()
val pluginRequirements = mutableListOf<PluginRequirement>()
val pluginAliasToIdMutable = existingPluginAliasToId.toMutableMap()
val uniqueDesiredPlugins = dependencyConfiguration.plugins.distinctBy { it.id }

for (desired in dependencyConfiguration.plugins) {
for (desired in uniqueDesiredPlugins) {
val existingAlias = existingPluginIdToAlias[desired.id]
if (existingAlias != null) {
resolvedPluginIdToAliasMutable[desired.id] = existingAlias
Expand Down Expand Up @@ -131,8 +132,9 @@ class VersionCatalogUpdater(
val resolvedLibraryModuleToAliasMutable = existingLibraryModuleToAlias.toMutableMap()
val libraryRequirements = mutableListOf<LibraryRequirement>()
val libraryAliasToModuleMutable = existingLibraryAliasToModule.toMutableMap()
val uniqueDesiredLibraries = dependencyConfiguration.libraries.distinctBy { it.module }

for (desired in dependencyConfiguration.libraries) {
for (desired in uniqueDesiredLibraries) {
val existingAlias = existingLibraryModuleToAlias[desired.module]
if (existingAlias != null) {
resolvedLibraryModuleToAliasMutable[desired.module] = existingAlias
Expand Down Expand Up @@ -201,7 +203,7 @@ class VersionCatalogUpdater(
fileCreator.createFileIfNotExists(catalogFile) { "" }

val pluginRequirements =
dependencyConfiguration.plugins.map { desired ->
dependencyConfiguration.plugins.distinctBy { it.id }.map { desired ->
PluginRequirement(
key = desired.key,
id = desired.id,
Expand All @@ -210,7 +212,7 @@ class VersionCatalogUpdater(
}

val libraryRequirements =
dependencyConfiguration.libraries.map { desired ->
dependencyConfiguration.libraries.distinctBy { it.module }.map { desired ->
LibraryRequirement(
key = desired.key,
module = desired.module,
Expand Down
140 changes: 140 additions & 0 deletions core/src/test/kotlin/com/mitteloupe/cag/core/generation/VersionCatalogUpdaterTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import com.mitteloupe.cag.core.fake.FakeFileSystemBridge
import com.mitteloupe.cag.core.generation.filesystem.FileCreator
import com.mitteloupe.cag.core.generation.versioncatalog.DependencyConfiguration
import com.mitteloupe.cag.core.generation.versioncatalog.LibraryConstants
import com.mitteloupe.cag.core.generation.versioncatalog.LibraryConstants.TEST_MOCKITO_ANDROID
import com.mitteloupe.cag.core.generation.versioncatalog.PluginConstants
import com.mitteloupe.cag.core.generation.versioncatalog.SectionEntryRequirement.LibraryRequirement
import com.mitteloupe.cag.core.generation.versioncatalog.SectionEntryRequirement.PluginRequirement
Expand All @@ -24,6 +25,145 @@ class VersionCatalogUpdaterTest {
classUnderTest = VersionCatalogUpdater(FileCreator(FakeFileSystemBridge()))
}

@Test
fun `Given libraries include library twice when createOrUpdateVersionCatalog then deduplicates`() {
// Given
val (projectRoot, catalogFile) =
createProjectWithCatalog(
initialContent =
"""
[versions]
kotlin = "2.2.10"
compileSdk = "36"
minSdk = "24"
""".trimIndent()
)

val dependencyConfiguration =
DependencyConfiguration(
versions = emptyList(),
libraries = listOf(TEST_MOCKITO_ANDROID, TEST_MOCKITO_ANDROID),
plugins = emptyList()
)
val expectedCatalog =
"""
[versions]
kotlin = "2.2.10"
compileSdk = "36"
minSdk = "24"
mockitoAndroid = "2.28.6"

[libraries]
test-mockito-android = { module = "com.linkedin.dexmaker:dexmaker-mockito-inline", version.ref = "mockitoAndroid" }

""".trimIndent()

// When
classUnderTest.createOrUpdateVersionCatalog(projectRootDir = projectRoot, dependencyConfiguration = dependencyConfiguration)
val actualCatalog = catalogFile.readText()

// Then
assertEquals(expectedCatalog, actualCatalog)
}

@Test
fun `Given plugins include plugin twice when createOrUpdateVersionCatalog then deduplicates`() {
// Given
val (projectRoot, catalogFile) =
createProjectWithCatalog(
initialContent =
"""
[versions]
kotlin = "2.2.10"
compileSdk = "36"
minSdk = "24"
""".trimIndent()
)

val dependencyConfiguration =
DependencyConfiguration(
versions = emptyList(),
libraries = emptyList(),
plugins = listOf(PluginConstants.KOTLIN_JVM, PluginConstants.KOTLIN_JVM)
)
val expectedCatalog =
"""
[versions]
kotlin = "2.2.10"
compileSdk = "36"
minSdk = "24"

[plugins]
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

""".trimIndent()

// When
classUnderTest.createOrUpdateVersionCatalog(projectRootDir = projectRoot, dependencyConfiguration = dependencyConfiguration)
val actualCatalog = catalogFile.readText()

// Then
assertEquals(expectedCatalog, actualCatalog)
}

@Test
fun `Given libraries include library twice when createOrReplaceVersionCatalog then deduplicates`() {
// Given
val projectRoot = createTempDirectory(prefix = "newCatalogDedupLib").toFile()

val dependencyConfiguration =
DependencyConfiguration(
versions = emptyList(),
libraries = listOf(TEST_MOCKITO_ANDROID, TEST_MOCKITO_ANDROID),
plugins = emptyList()
)
val expectedCatalog =
"""
[versions]
mockitoAndroid = "2.28.6"

[libraries]
test-mockito-android = { module = "com.linkedin.dexmaker:dexmaker-mockito-inline", version.ref = "mockitoAndroid" }

""".trimIndent()

// When
classUnderTest.createOrReplaceVersionCatalog(projectRootDir = projectRoot, dependencyConfiguration = dependencyConfiguration)
val actualCatalog = File(projectRoot, "gradle/libs.versions.toml").readText()

// Then
assertEquals(expectedCatalog, actualCatalog)
}

@Test
fun `Given plugins include plugin twice when createOrReplaceVersionCatalog then deduplicates`() {
// Given
val projectRoot = createTempDirectory(prefix = "newCatalogDedupPlugin").toFile()

val dependencyConfiguration =
DependencyConfiguration(
versions = emptyList(),
libraries = emptyList(),
plugins = listOf(PluginConstants.KOTLIN_JVM, PluginConstants.KOTLIN_JVM)
)
val expectedCatalog =
"""
[versions]
kotlin = "2.2.10"

[plugins]
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

""".trimIndent()

// When
classUnderTest.createOrReplaceVersionCatalog(projectRootDir = projectRoot, dependencyConfiguration = dependencyConfiguration)
val actualCatalog = File(projectRoot, "gradle/libs.versions.toml").readText()

// Then
assertEquals(expectedCatalog, actualCatalog)
}

@Test
fun `Given no catalog file when createOrUpdateVersionCatalog then does nothing`() {
// Given
Expand Down