Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

allLibraries renamed to allLibrariesImpl and only reference implementation of the libraries.

Browse source
This commit is contained in:
Benoit Marty 2023-03-16 10:09:18 +01:00 • committed by Benoit Marty
parent 5f1085b4ba
commit ad6a2e9595
5 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/build.gradle.kts
View file

@ -18,7 +18,7 @@
import com.android.build.api.variant.FilterConfiguration.FilterType.ABI import com.android.build.api.variant.FilterConfiguration.FilterType.ABI
import extension.allFeaturesImpl import extension.allFeaturesImpl
import extension.allLibraries import extension.allLibrariesImpl
// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed // TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
@Suppress("DSL_SCOPE_VIOLATION") @Suppress("DSL_SCOPE_VIOLATION")
@ -200,11 +200,8 @@ knit {
} }
dependencies { dependencies {
allLibraries() allLibrariesImpl()
allFeaturesImpl() allFeaturesImpl()
implementation(projects.libraries.matrix.impl)
implementation(projects.libraries.dateformatter.impl)
implementation(projects.libraries.sessionStorage.impl)
implementation(projects.tests.uitests) implementation(projects.tests.uitests)
implementation(projects.anvilannotations) implementation(projects.anvilannotations)
implementation(projects.appnav) implementation(projects.appnav)

2
libraries/matrix/impl/build.gradle.kts
View file

@ -34,7 +34,7 @@ dependencies {
// api(projects.libraries.rustsdk) // api(projects.libraries.rustsdk)
implementation(libs.matrix.sdk) implementation(libs.matrix.sdk)
implementation(projects.libraries.di) implementation(projects.libraries.di)
implementation(projects.libraries.matrix.api) api(projects.libraries.matrix.api)
implementation(libs.dagger) implementation(libs.dagger)
implementation(projects.libraries.core) implementation(projects.libraries.core)
implementation("net.java.dev.jna:jna:5.13.0@aar") implementation("net.java.dev.jna:jna:5.13.0@aar")

2
libraries/session-storage/impl/build.gradle.kts
View file

@ -32,7 +32,7 @@ dependencies {
implementation(libs.dagger) implementation(libs.dagger)
implementation(projects.libraries.core) implementation(projects.libraries.core)
implementation(projects.libraries.encryptedDb) implementation(projects.libraries.encryptedDb)
implementation(projects.libraries.sessionStorage.api) api(projects.libraries.sessionStorage.api)
implementation(libs.sqldelight.driver.android) implementation(libs.sqldelight.driver.android)
implementation(libs.sqlcipher) implementation(libs.sqlcipher)
implementation(libs.sqlite) implementation(libs.sqlite)

8
plugins/src/main/kotlin/extension/DependencyHandleScope.kt
View file

@ -51,14 +51,16 @@ fun DependencyHandlerScope.composeDependencies(libs: LibrariesForLibs) {
implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5") implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5")
} }
fun DependencyHandlerScope.allLibraries() { fun DependencyHandlerScope.allLibrariesImpl() {
implementation(project(":libraries:designsystem")) implementation(project(":libraries:designsystem"))
implementation(project(":libraries:matrix:api")) implementation(project(":libraries:matrix:impl"))
implementation(project(":libraries:matrixui")) implementation(project(":libraries:matrixui"))
implementation(project(":libraries:core")) implementation(project(":libraries:core"))
implementation(project(":libraries:architecture")) implementation(project(":libraries:architecture"))
implementation(project(":libraries:dateformatter:api")) implementation(project(":libraries:dateformatter:impl"))
implementation(project(":libraries:di")) implementation(project(":libraries:di"))
implementation(project(":libraries:session-storage:impl"))
} }
fun DependencyHandlerScope.allFeaturesApi() { fun DependencyHandlerScope.allFeaturesApi() {

4
tests/uitests/build.gradle.kts
View file

@ -15,7 +15,7 @@
*/ */
import extension.allFeaturesImpl import extension.allFeaturesImpl
import extension.allLibraries import extension.allLibrariesImpl
// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed // TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
@Suppress("DSL_SCOPE_VIOLATION") @Suppress("DSL_SCOPE_VIOLATION")
@ -39,6 +39,6 @@ dependencies {
implementation(libs.showkase) implementation(libs.showkase)
ksp(libs.showkase.processor) ksp(libs.showkase.processor)
allLibraries() allLibrariesImpl()
allFeaturesImpl() allFeaturesImpl()
} }