diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 09bac9e57b..c906990cc9 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -16,6 +16,9 @@ * limitations under the License. */ +import extension.allLibraries +import extension.allFeatures + // TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed @Suppress("DSL_SCOPE_VIOLATION") plugins { @@ -156,19 +159,8 @@ knit { } dependencies { - implementation(project(":libraries:designsystem")) - implementation(project(":libraries:matrix")) - implementation(project(":libraries:matrixui")) - implementation(project(":libraries:core")) - implementation(project(":libraries:architecture")) - implementation(project(":features:onboarding")) - implementation(project(":features:login")) - implementation(project(":features:logout")) - implementation(project(":features:roomlist")) - implementation(project(":features:messages")) - implementation(project(":features:rageshake")) - implementation(project(":features:preferences")) - implementation(project(":libraries:di")) + allLibraries() + allFeatures() implementation(project(":tests:uitests")) implementation(project(":anvilannotations")) anvil(project(":anvilcodegen")) diff --git a/plugins/src/main/kotlin/extension/DependencyHandleScope.kt b/plugins/src/main/kotlin/extension/DependencyHandleScope.kt index bdfa1460bf..15209f7bce 100644 --- a/plugins/src/main/kotlin/extension/DependencyHandleScope.kt +++ b/plugins/src/main/kotlin/extension/DependencyHandleScope.kt @@ -20,6 +20,7 @@ import gradle.kotlin.dsl.accessors._4b7ad2363fc1fce7c774e054dc9a9300.androidTest import gradle.kotlin.dsl.accessors._4b7ad2363fc1fce7c774e054dc9a9300.debugImplementation import gradle.kotlin.dsl.accessors._4b7ad2363fc1fce7c774e054dc9a9300.implementation import org.gradle.kotlin.dsl.DependencyHandlerScope +import org.gradle.kotlin.dsl.project /** * Dependencies used by all the modules @@ -49,3 +50,21 @@ fun DependencyHandlerScope.composeDependencies() { implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5") } +fun DependencyHandlerScope.allLibraries() { + implementation(project(":libraries:designsystem")) + implementation(project(":libraries:matrix")) + implementation(project(":libraries:matrixui")) + implementation(project(":libraries:core")) + implementation(project(":libraries:architecture")) + implementation(project(":libraries:di")) +} + +fun DependencyHandlerScope.allFeatures() { + implementation(project(":features:onboarding")) + implementation(project(":features:login")) + implementation(project(":features:logout")) + implementation(project(":features:roomlist")) + implementation(project(":features:messages")) + implementation(project(":features:rageshake")) + implementation(project(":features:preferences")) +} diff --git a/tests/uitests/build.gradle.kts b/tests/uitests/build.gradle.kts index ff21a715ca..fb68b9b00d 100644 --- a/tests/uitests/build.gradle.kts +++ b/tests/uitests/build.gradle.kts @@ -14,6 +14,9 @@ * limitations under the License. */ +import extension.allLibraries +import extension.allFeatures + plugins { id("io.element.android-compose-library") alias(libs.plugins.ksp) @@ -39,4 +42,7 @@ dependencies { implementation(libs.showkase) ksp(libs.showkase.processor) + + allLibraries() + allFeatures() }