Skip to content

Commit 03e05ff

Browse files
committed
Improve the way we include all modules for clarity.
1 parent 5a133b7 commit 03e05ff

File tree

1 file changed

+22
-6
lines changed

1 file changed

+22
-6
lines changed

plugins/src/main/kotlin/extension/DependencyHandleScope.kt

+22-6
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ internal fun DependencyHandler.implementation(dependency: Any) = add("implementa
2525
private fun DependencyHandlerScope.implementation(
2626
dependency: Any,
2727
config: Action<ExternalModuleDependency>
28-
) = dependencies.add("implementation", dependency, closureOf<ExternalModuleDependency> { config.execute(this) })
28+
) = dependencies.add("implementation", dependency, closureOf<ExternalModuleDependency> { config.execute(this) })
2929

3030
private fun DependencyHandlerScope.androidTestImplementation(dependency: Any) = dependencies.add("androidTestImplementation", dependency)
3131

@@ -114,14 +114,30 @@ fun DependencyHandlerScope.allServicesImpl() {
114114
implementation(project(":services:toolbox:impl"))
115115
}
116116

117-
fun DependencyHandlerScope.allEnterpriseImpl(project: Project) = addAll(project, "enterprise", "impl")
117+
fun DependencyHandlerScope.allEnterpriseImpl(project: Project) = addAll(
118+
project = project,
119+
modulePrefix = ":enterprise:features",
120+
moduleSuffix = ":impl",
121+
)
118122

119-
fun DependencyHandlerScope.allFeaturesImpl(project: Project) = addAll(project, "features", "impl")
123+
fun DependencyHandlerScope.allFeaturesImpl(project: Project) = addAll(
124+
project = project,
125+
modulePrefix = ":features",
126+
moduleSuffix = ":impl",
127+
)
120128

121-
fun DependencyHandlerScope.allFeaturesApi(project: Project) = addAll(project, "features", "api")
129+
fun DependencyHandlerScope.allFeaturesApi(project: Project) = addAll(
130+
project = project,
131+
modulePrefix = ":features",
132+
moduleSuffix = ":api",
133+
)
122134

123-
private fun DependencyHandlerScope.addAll(project: Project, prefix: String, suffix: String) {
124-
val subProjects = project.rootProject.subprojects.filter { it.path.startsWith(":$prefix") && it.path.endsWith(":$suffix") }
135+
private fun DependencyHandlerScope.addAll(
136+
project: Project,
137+
modulePrefix: String,
138+
moduleSuffix: String,
139+
) {
140+
val subProjects = project.rootProject.subprojects.filter { it.path.startsWith(modulePrefix) && it.path.endsWith(moduleSuffix) }
125141
for (p in subProjects) {
126142
add("implementation", p)
127143
}

0 commit comments

Comments
 (0)