diff --git a/anvilcodegen/build.gradle.kts b/anvilcodegen/build.gradle.kts index da817a5edb..e8b6ab285c 100644 --- a/anvilcodegen/build.gradle.kts +++ b/anvilcodegen/build.gradle.kts @@ -22,7 +22,7 @@ plugins { } dependencies { - implementation(project(":anvilannotations")) + implementation(projects.anvilannotations) api(libs.anvil.compiler.api) implementation(libs.anvil.compiler.utils) implementation("com.squareup:kotlinpoet:1.12.0") diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a3818bf972..41029596ab 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -164,9 +164,9 @@ knit { dependencies { allLibraries() allFeatures() - implementation(project(":tests:uitests")) - implementation(project(":anvilannotations")) - anvil(project(":anvilcodegen")) + implementation(projects.tests.uitests) + implementation(projects.anvilannotations) + anvil(projects.anvilcodegen) // https://developer.android.com/studio/write/java8-support#library-desugaring-versions coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.2.2") diff --git a/features/login/build.gradle.kts b/features/login/build.gradle.kts index 1f424d86d5..13d386671c 100644 --- a/features/login/build.gradle.kts +++ b/features/login/build.gradle.kts @@ -32,17 +32,17 @@ anvil { } dependencies { - implementation(project(":anvilannotations")) - anvil(project(":anvilcodegen")) - implementation(project(":libraries:di")) - implementation(project(":libraries:core")) - implementation(project(":libraries:architecture")) - implementation(project(":libraries:matrix")) - implementation(project(":libraries:designsystem")) - implementation(project(":libraries:elementresources")) - implementation(project(":libraries:testtags")) + implementation(projects.anvilannotations) + anvil(projects.anvilcodegen) + implementation(projects.libraries.di) + implementation(projects.libraries.core) + implementation(projects.libraries.architecture) + implementation(projects.libraries.matrix) + implementation(projects.libraries.designsystem) + implementation(projects.libraries.elementresources) + implementation(projects.libraries.testtags) implementation(libs.appyx.core) - implementation(project(":libraries:ui-strings")) + implementation(projects.libraries.uiStrings) ksp(libs.showkase.processor) testImplementation(libs.test.junit) androidTestImplementation(libs.test.junitext) diff --git a/features/logout/build.gradle.kts b/features/logout/build.gradle.kts index e022a4cb87..71f4f78df4 100644 --- a/features/logout/build.gradle.kts +++ b/features/logout/build.gradle.kts @@ -31,15 +31,15 @@ anvil { } dependencies { - implementation(project(":anvilannotations")) - anvil(project(":anvilcodegen")) - implementation(project(":libraries:di")) - implementation(project(":libraries:architecture")) - implementation(project(":libraries:core")) - implementation(project(":libraries:matrix")) - implementation(project(":libraries:designsystem")) - implementation(project(":libraries:elementresources")) - implementation(project(":libraries:ui-strings")) + implementation(projects.anvilannotations) + anvil(projects.anvilcodegen) + implementation(projects.libraries.di) + implementation(projects.libraries.architecture) + implementation(projects.libraries.core) + implementation(projects.libraries.matrix) + implementation(projects.libraries.designsystem) + implementation(projects.libraries.elementresources) + implementation(projects.libraries.uiStrings) ksp(libs.showkase.processor) testImplementation(libs.test.junit) androidTestImplementation(libs.test.junitext) diff --git a/features/messages/build.gradle.kts b/features/messages/build.gradle.kts index 02c0a245d8..f11c076f27 100644 --- a/features/messages/build.gradle.kts +++ b/features/messages/build.gradle.kts @@ -31,15 +31,15 @@ anvil { } dependencies { - implementation(project(":anvilannotations")) - anvil(project(":anvilcodegen")) - implementation(project(":libraries:di")) - implementation(project(":libraries:core")) - implementation(project(":libraries:architecture")) - implementation(project(":libraries:matrix")) - implementation(project(":libraries:matrixui")) - implementation(project(":libraries:designsystem")) - implementation(project(":libraries:textcomposer")) + implementation(projects.anvilannotations) + anvil(projects.anvilcodegen) + implementation(projects.libraries.di) + implementation(projects.libraries.core) + implementation(projects.libraries.architecture) + implementation(projects.libraries.matrix) + implementation(projects.libraries.matrixui) + implementation(projects.libraries.designsystem) + implementation(projects.libraries.textcomposer) implementation(libs.appyx.core) implementation(libs.coil.compose) implementation(libs.datetime) diff --git a/features/onboarding/build.gradle.kts b/features/onboarding/build.gradle.kts index 24b32d6ba1..00f4503666 100644 --- a/features/onboarding/build.gradle.kts +++ b/features/onboarding/build.gradle.kts @@ -26,12 +26,12 @@ android { } dependencies { - implementation(project(":libraries:core")) - implementation(project(":libraries:elementresources")) - implementation(project(":libraries:ui-strings")) - implementation(project(":libraries:designsystem")) - implementation(project(":libraries:architecture")) - implementation(project(":libraries:testtags")) + implementation(projects.libraries.core) + implementation(projects.libraries.elementresources) + implementation(projects.libraries.uiStrings) + implementation(projects.libraries.designsystem) + implementation(projects.libraries.architecture) + implementation(projects.libraries.testtags) implementation(libs.accompanist.pager) implementation(libs.accompanist.pagerindicator) implementation(libs.appyx.core) diff --git a/features/preferences/build.gradle.kts b/features/preferences/build.gradle.kts index 894087b50e..10b3f4917d 100644 --- a/features/preferences/build.gradle.kts +++ b/features/preferences/build.gradle.kts @@ -32,17 +32,17 @@ anvil { } dependencies { - implementation(project(":anvilannotations")) - anvil(project(":anvilcodegen")) - implementation(project(":libraries:di")) - implementation(project(":libraries:architecture")) - implementation(project(":libraries:core")) - implementation(project(":libraries:matrixui")) - implementation(project(":features:rageshake")) - implementation(project(":features:logout")) - implementation(project(":libraries:designsystem")) - implementation(project(":libraries:elementresources")) - implementation(project(":libraries:ui-strings")) + implementation(projects.anvilannotations) + anvil(projects.anvilcodegen) + implementation(projects.libraries.di) + implementation(projects.libraries.architecture) + implementation(projects.libraries.core) + implementation(projects.libraries.matrixui) + implementation(projects.features.rageshake) + implementation(projects.features.logout) + implementation(projects.libraries.designsystem) + implementation(projects.libraries.elementresources) + implementation(projects.libraries.uiStrings) implementation(libs.datetime) implementation(libs.accompanist.placeholder) testImplementation(libs.test.junit) diff --git a/features/rageshake/build.gradle.kts b/features/rageshake/build.gradle.kts index fa2aee4b2c..16f529db26 100644 --- a/features/rageshake/build.gradle.kts +++ b/features/rageshake/build.gradle.kts @@ -32,14 +32,14 @@ anvil { } dependencies { - implementation(project(":libraries:core")) - anvil(project(":anvilcodegen")) - implementation(project(":libraries:di")) - implementation(project(":libraries:architecture")) - implementation(project(":anvilannotations")) - implementation(project(":libraries:designsystem")) - implementation(project(":libraries:elementresources")) - implementation(project(":libraries:ui-strings")) + implementation(projects.libraries.core) + anvil(projects.anvilcodegen) + implementation(projects.libraries.di) + implementation(projects.libraries.architecture) + implementation(projects.anvilannotations) + implementation(projects.libraries.designsystem) + implementation(projects.libraries.elementresources) + implementation(projects.libraries.uiStrings) implementation(libs.squareup.seismic) implementation(libs.androidx.datastore.preferences) implementation(libs.coil) diff --git a/features/roomlist/build.gradle.kts b/features/roomlist/build.gradle.kts index fa0b3c4661..2d23e891cc 100644 --- a/features/roomlist/build.gradle.kts +++ b/features/roomlist/build.gradle.kts @@ -31,18 +31,18 @@ anvil { } dependencies { - anvil(project(":anvilcodegen")) - implementation(project(":anvilannotations")) + anvil(projects.anvilcodegen) + implementation(projects.anvilannotations) - implementation(project(":libraries:di")) - implementation(project(":libraries:core")) - implementation(project(":libraries:architecture")) - implementation(project(":libraries:matrix")) - implementation(project(":libraries:matrixui")) - implementation(project(":libraries:designsystem")) + implementation(projects.libraries.di) + implementation(projects.libraries.core) + implementation(projects.libraries.architecture) + implementation(projects.libraries.matrix) + implementation(projects.libraries.matrixui) + implementation(projects.libraries.designsystem) implementation(libs.appyx.core) - implementation(project(":libraries:elementresources")) - implementation(project(":libraries:ui-strings")) + implementation(projects.libraries.elementresources) + implementation(projects.libraries.uiStrings) implementation(libs.datetime) implementation(libs.accompanist.placeholder) @@ -51,7 +51,7 @@ dependencies { testImplementation(libs.molecule.runtime) testImplementation(libs.test.truth) testImplementation(libs.test.turbine) - testImplementation(project(":libraries:matrixtest")) + testImplementation(projects.libraries.matrixtest) androidTestImplementation(libs.test.junitext) diff --git a/features/template/build.gradle.kts b/features/template/build.gradle.kts index f7a265e462..fea038bf14 100644 --- a/features/template/build.gradle.kts +++ b/features/template/build.gradle.kts @@ -32,17 +32,17 @@ anvil { } dependencies { - anvil(project(":anvilcodegen")) - implementation(project(":anvilannotations")) + anvil(projects.anvilcodegen) + implementation(projects.anvilannotations) - implementation(project(":libraries:di")) - implementation(project(":libraries:core")) - implementation(project(":libraries:architecture")) - implementation(project(":libraries:matrix")) - implementation(project(":libraries:matrixui")) - implementation(project(":libraries:designsystem")) - implementation(project(":libraries:elementresources")) - implementation(project(":libraries:ui-strings")) + implementation(projects.libraries.di) + implementation(projects.libraries.core) + implementation(projects.libraries.architecture) + implementation(projects.libraries.matrix) + implementation(projects.libraries.matrixui) + implementation(projects.libraries.designsystem) + implementation(projects.libraries.elementresources) + implementation(projects.libraries.uiStrings) implementation(libs.appyx.core) @@ -51,7 +51,7 @@ dependencies { testImplementation(libs.molecule.runtime) testImplementation(libs.test.truth) testImplementation(libs.test.turbine) - testImplementation(project(":libraries:matrixtest")) + testImplementation(projects.libraries.matrixtest) androidTestImplementation(libs.test.junitext) diff --git a/libraries/architecture/build.gradle.kts b/libraries/architecture/build.gradle.kts index 962c6021be..9c4ae9e3ac 100644 --- a/libraries/architecture/build.gradle.kts +++ b/libraries/architecture/build.gradle.kts @@ -25,7 +25,7 @@ android { } dependencies { - api(project(":libraries:di")) + api(projects.libraries.di) api(libs.dagger) api(libs.appyx.core) api(libs.molecule.runtime) diff --git a/libraries/designsystem/build.gradle.kts b/libraries/designsystem/build.gradle.kts index 00f635eb69..45430e5d82 100644 --- a/libraries/designsystem/build.gradle.kts +++ b/libraries/designsystem/build.gradle.kts @@ -28,8 +28,8 @@ android { // Should not be there, but this is a POC implementation(libs.coil.compose) implementation(libs.accompanist.systemui) - implementation(project(":libraries:elementresources")) - implementation(project(":libraries:ui-strings")) + implementation(projects.libraries.elementresources) + implementation(projects.libraries.uiStrings) ksp(libs.showkase.processor) } } diff --git a/libraries/matrix/build.gradle.kts b/libraries/matrix/build.gradle.kts index fcf2c78eea..6db92e02f3 100644 --- a/libraries/matrix/build.gradle.kts +++ b/libraries/matrix/build.gradle.kts @@ -31,10 +31,10 @@ anvil { } dependencies { - api(project(":libraries:rustsdk")) - implementation(project(":libraries:di")) + api(projects.libraries.rustsdk) + implementation(projects.libraries.di) implementation(libs.dagger) - implementation(project(":libraries:core")) + implementation(projects.libraries.core) implementation("net.java.dev.jna:jna:5.13.0@aar") implementation(libs.androidx.datastore.preferences) implementation(libs.serialization.json) diff --git a/libraries/matrixtest/build.gradle.kts b/libraries/matrixtest/build.gradle.kts index 5bb1e92df3..39641e7eed 100644 --- a/libraries/matrixtest/build.gradle.kts +++ b/libraries/matrixtest/build.gradle.kts @@ -25,6 +25,6 @@ android { } dependencies { - api(project(":libraries:matrix")) + api(projects.libraries.matrix) api(libs.coroutines.core) } diff --git a/libraries/matrixui/build.gradle.kts b/libraries/matrixui/build.gradle.kts index 2187a36b07..38004098ca 100644 --- a/libraries/matrixui/build.gradle.kts +++ b/libraries/matrixui/build.gradle.kts @@ -30,12 +30,12 @@ anvil { } dependencies { - implementation(project(":anvilannotations")) - anvil(project(":anvilcodegen")) - implementation(project(":libraries:di")) - implementation(project(":libraries:architecture")) - implementation(project(":libraries:matrix")) - implementation(project(":libraries:designsystem")) - implementation(project(":libraries:core")) + implementation(projects.anvilannotations) + anvil(projects.anvilcodegen) + implementation(projects.libraries.di) + implementation(projects.libraries.architecture) + implementation(projects.libraries.matrix) + implementation(projects.libraries.designsystem) + implementation(projects.libraries.core) implementation(libs.coil.compose) } diff --git a/libraries/textcomposer/build.gradle.kts b/libraries/textcomposer/build.gradle.kts index 5e84aca979..040a265f80 100644 --- a/libraries/textcomposer/build.gradle.kts +++ b/libraries/textcomposer/build.gradle.kts @@ -30,10 +30,10 @@ android { } dependencies { - implementation(project(":libraries:elementresources")) - implementation(project(":libraries:ui-strings")) - implementation(project(":libraries:core")) - implementation(project(":libraries:matrix")) + implementation(projects.libraries.elementresources) + implementation(projects.libraries.uiStrings) + implementation(projects.libraries.core) + implementation(projects.libraries.matrix) implementation(libs.wysiwyg) implementation(libs.androidx.constraintlayout) implementation("com.google.android.material:material:1.7.0") diff --git a/settings.gradle.kts b/settings.gradle.kts index 22dc8447ad..669bac4635 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -32,6 +32,9 @@ dependencyResolutionManagement { } } } + +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") + rootProject.name = "ElementX" include(":app") include(":libraries:core")