Skip to content

Commit 698f843

Browse files
authored
Added missing dynamic version catalog dependencies. (#59)
1 parent 1589e72 commit 698f843

File tree

5 files changed

+11
-4
lines changed

5 files changed

+11
-4
lines changed

core/src/main/kotlin/com/mitteloupe/cag/core/content/AppGradleBuilder.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ fun buildAppGradleScript(
3232
).asAccessor
3333
val aliasComposeMaterial3 = catalog.getResolvedLibraryAliasForModule(LibraryConstants.COMPOSE_MATERIAL3).asAccessor
3434
val aliasComposeUiTooling = catalog.getResolvedLibraryAliasForModule(LibraryConstants.ANDROIDX_UI_TOOLING).asAccessor
35+
val aliasComposeUiTestManifest = catalog.getResolvedLibraryAliasForModule(LibraryConstants.ANDROIDX_UI_TEST_MANIFEST).asAccessor
3536

3637
val aliasActivityCompose = catalog.getResolvedLibraryAliasForModule(LibraryConstants.ANDROIDX_ACTIVITY_COMPOSE).asAccessor
3738
"""
@@ -41,7 +42,7 @@ fun buildAppGradleScript(
4142
implementation(libs.$aliasComposeUiToolingPreview)
4243
implementation(libs.$aliasComposeMaterial3)
4344
debugImplementation(libs.$aliasComposeUiTooling)
44-
debugImplementation(libs.compose.ui.test.manifest)
45+
debugImplementation(libs.$aliasComposeUiTestManifest)
4546
"""
4647
} else {
4748
val aliasAndroidxAppcompat = catalog.getResolvedLibraryAliasForModule(LibraryConstants.ANDROIDX_APPCOMPAT).asAccessor

core/src/main/kotlin/com/mitteloupe/cag/core/content/architecture/ArchitectureDomainGradleScriptBuilder.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
package com.mitteloupe.cag.core.content.architecture
22

33
import com.mitteloupe.cag.core.content.gradle.GradleFileExtender
4+
import com.mitteloupe.cag.core.generation.versioncatalog.LibraryConstants
45
import com.mitteloupe.cag.core.generation.versioncatalog.PluginConstants
56
import com.mitteloupe.cag.core.generation.versioncatalog.VersionCatalogReader
67
import com.mitteloupe.cag.core.generation.versioncatalog.asAccessor
78

89
fun buildArchitectureDomainGradleScript(catalog: VersionCatalogReader): String {
910
val pluginAliasKotlinJvm = catalog.getResolvedPluginAliasFor(PluginConstants.KOTLIN_JVM).asAccessor
11+
val libraryAliasCoroutinesCore = catalog.getResolvedLibraryAliasForModule(LibraryConstants.KOTLINX_COROUTINES_CORE).asAccessor
1012

1113
val gradleFileExtender = GradleFileExtender()
1214
val ktlintPluginLine = gradleFileExtender.buildKtlintPluginLine(catalog)
@@ -27,7 +29,7 @@ ${ if (configurations.isEmpty()) {
2729
}
2830
dependencies {
2931
implementation(projects.coroutine)
30-
implementation(libs.kotlinx.coroutines.core)
32+
implementation(libs.$libraryAliasCoroutinesCore)
3133
}
3234
"""
3335
}

core/src/main/kotlin/com/mitteloupe/cag/core/content/architecture/ArchitecturePresentationGradleScriptBuilder.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import com.mitteloupe.cag.core.generation.versioncatalog.asAccessor
88

99
fun buildArchitecturePresentationGradleScript(catalog: VersionCatalogReader): String {
1010
val pluginAliasKotlinJvm = catalog.getResolvedPluginAliasFor(PluginConstants.KOTLIN_JVM).asAccessor
11+
val libraryAliasCoroutinesCore = catalog.getResolvedLibraryAliasForModule(LibraryConstants.KOTLINX_COROUTINES_CORE).asAccessor
1112

1213
val gradleFileExtender = GradleFileExtender()
1314
val ktlintPluginLine = gradleFileExtender.buildKtlintPluginLine(catalog)
@@ -35,7 +36,7 @@ ${ if (configurations.isEmpty()) {
3536
}
3637
dependencies {
3738
implementation(projects.architecture.domain)
38-
implementation(libs.kotlinx.coroutines.core)
39+
implementation(libs.$libraryAliasCoroutinesCore)
3940
testImplementation(libs.$aliasTestJunit)
4041
}
4142
"""

core/src/main/kotlin/com/mitteloupe/cag/core/content/architecture/ArchitecturePresentationTestGradleScriptBuilder.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import com.mitteloupe.cag.core.generation.versioncatalog.asAccessor
99
fun buildArchitecturePresentationTestGradleScript(catalog: VersionCatalogReader): String {
1010
val pluginAliasKotlinJvm = catalog.getResolvedPluginAliasFor(PluginConstants.KOTLIN_JVM).asAccessor
1111

12+
val aliasCoroutinesCore = catalog.getResolvedLibraryAliasForModule(LibraryConstants.KOTLINX_COROUTINES_CORE).asAccessor
1213
val aliasTestJunit = catalog.getResolvedLibraryAliasForModule(LibraryConstants.TEST_JUNIT).asAccessor
1314
val aliasTestKotlinxCoroutines =
1415
catalog.getResolvedLibraryAliasForModule(LibraryConstants.TEST_KOTLINX_COROUTINES).asAccessor
@@ -38,7 +39,7 @@ dependencies {
3839
implementation(projects.architecture.presentation)
3940
implementation(projects.architecture.domain)
4041
41-
implementation(libs.kotlinx.coroutines.core)
42+
implementation(libs.$aliasCoroutinesCore)
4243
4344
implementation(libs.$aliasTestJunit)
4445
implementation(libs.$aliasTestKotlinxCoroutines)

plugin/src/main/kotlin/com/mitteloupe/cag/cleanarchitecturegenerator/CreateCleanArchitectureFeatureDialog.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,9 @@ class CreateCleanArchitectureFeatureDialog(
129129
)
130130
}
131131
row(CleanArchitectureGeneratorBundle.message("dialog.feature.code.quality.label")) {
132+
@Suppress("DialogTitleCapitalization")
132133
checkBox("ktlint").bindSelected(::enableKtlintInternal)
134+
@Suppress("DialogTitleCapitalization")
133135
checkBox("detekt").bindSelected(::enableDetektInternal)
134136
}
135137
}

0 commit comments

Comments
 (0)