mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-02 21:32:34 +00:00
Merge remote-tracking branch 'origin/develop' into mxandreas/disable-public-rooms
# Conflicts: # enterprise
This commit is contained in:
@@ -29,7 +29,6 @@ setupDependencyInjection()
|
||||
dependencies {
|
||||
api(projects.features.securityandprivacy.api)
|
||||
implementation(projects.appconfig)
|
||||
implementation(projects.appnav)
|
||||
implementation(projects.libraries.androidutils)
|
||||
implementation(projects.libraries.architecture)
|
||||
implementation(projects.libraries.core)
|
||||
@@ -39,12 +38,10 @@ dependencies {
|
||||
implementation(projects.libraries.previewutils)
|
||||
implementation(projects.libraries.matrixui)
|
||||
implementation(projects.libraries.uiStrings)
|
||||
implementation(projects.services.analytics.api)
|
||||
implementation(projects.libraries.featureflag.api)
|
||||
implementation(projects.features.enterprise.api)
|
||||
|
||||
testCommonDependencies(libs, true)
|
||||
testImplementation(projects.services.analytics.test)
|
||||
testImplementation(projects.libraries.matrix.test)
|
||||
testImplementation(projects.libraries.featureflag.test)
|
||||
testImplementation(projects.libraries.testtags)
|
||||
|
||||
Reference in New Issue
Block a user