In the module :libraries:matrix.api, change the dependencies to:

- libraries.sessionStorage.api - projects.libraries.architecture from `api` to `implementation`. Modules who need `:libraries:matrix.api` do not necessarily need to use the session storage api.
2026-04-30 09:52:10 +02:00 · 2026-04-30 09:52:10 +02:00 · 4d0be69b4c
commit 4d0be69b4c
parent 8b8eedb419
28 changed files with 33 additions and 4 deletions
--- a/appconfig/build.gradle.kts
+++ b/appconfig/build.gradle.kts
@ -48,6 +48,8 @@ android {
 }

 dependencies {
+    implementation(libs.coroutines.core)
    implementation(libs.androidx.annotationjvm)
+    implementation(libs.androidx.corektx)
    implementation(projects.libraries.matrix.api)
 }
--- a/appnav/build.gradle.kts
+++ b/appnav/build.gradle.kts
@ -40,6 +40,7 @@ dependencies {
    implementation(projects.libraries.designsystem)
    implementation(projects.libraries.matrixui)
    implementation(projects.libraries.matrixmedia.api)
+    implementation(projects.libraries.sessionStorage.api)
    implementation(projects.libraries.uiCommon)
    implementation(projects.libraries.uiStrings)
    implementation(projects.features.login.api)
--- a/features/enterprise/test/build.gradle.kts
+++ b/features/enterprise/test/build.gradle.kts
@ -15,6 +15,7 @@ android {

 dependencies {
    api(projects.features.enterprise.api)
+    implementation(projects.libraries.architecture)
    implementation(projects.libraries.compound)
    implementation(projects.libraries.matrix.api)
    implementation(projects.tests.testutils)
--- a/features/home/impl/build.gradle.kts
+++ b/features/home/impl/build.gradle.kts
@ -46,6 +46,7 @@ dependencies {
    implementation(projects.libraries.permissions.noop)
    implementation(projects.libraries.preferences.api)
    implementation(projects.libraries.push.api)
+    implementation(projects.libraries.sessionStorage.api)
    implementation(projects.features.announcement.api)
    implementation(projects.features.invite.api)
    implementation(projects.features.networkmonitor.api)
--- a/features/invite/impl/build.gradle.kts
+++ b/features/invite/impl/build.gradle.kts
@ -33,6 +33,7 @@ dependencies {
    implementation(projects.libraries.architecture)
    implementation(projects.libraries.matrix.api)
    implementation(projects.libraries.matrixui)
+    implementation(projects.libraries.sessionStorage.api)
    implementation(projects.libraries.designsystem)
    implementation(projects.libraries.uiStrings)
    implementation(projects.services.analytics.api)
--- a/features/invite/test/build.gradle.kts
+++ b/features/invite/test/build.gradle.kts
@ -16,6 +16,7 @@ android {

 dependencies {
    implementation(libs.coroutines.core)
+    implementation(projects.libraries.architecture)
    implementation(projects.libraries.matrix.api)
    implementation(projects.libraries.matrix.test)
    implementation(projects.tests.testutils)
--- a/features/location/test/build.gradle.kts
+++ b/features/location/test/build.gradle.kts
@ -16,7 +16,7 @@ android {

 dependencies {
    api(projects.features.location.api)
+    implementation(projects.libraries.architecture)
    implementation(projects.libraries.matrix.api)
-    implementation(libs.appyx.core)
    implementation(projects.tests.testutils)
 }
--- a/features/logout/impl/build.gradle.kts
+++ b/features/logout/impl/build.gradle.kts
@ -35,6 +35,7 @@ dependencies {
    implementation(projects.libraries.testtags)
    implementation(projects.libraries.uiStrings)
    implementation(projects.libraries.dateformatter.api)
+    implementation(projects.libraries.sessionStorage.api)
    implementation(projects.libraries.workmanager.api)
    api(projects.features.logout.api)

--- a/features/messages/test/build.gradle.kts
+++ b/features/messages/test/build.gradle.kts
@ -16,6 +16,7 @@ android {

 dependencies {
    api(projects.features.messages.impl)
+    implementation(projects.libraries.architecture)
    implementation(projects.libraries.matrix.test)
    implementation(projects.libraries.audio.test)
    implementation(projects.libraries.mediaplayer.test)
--- a/features/poll/test/build.gradle.kts
+++ b/features/poll/test/build.gradle.kts
@ -15,6 +15,7 @@ android {
 }

 dependencies {
+    implementation(projects.libraries.architecture)
    implementation(projects.libraries.matrix.api)
    api(projects.features.poll.api)
    implementation(libs.kotlinx.collections.immutable)
--- a/features/preferences/impl/build.gradle.kts
+++ b/features/preferences/impl/build.gradle.kts
@ -68,6 +68,7 @@ dependencies {
    implementation(projects.libraries.permissions.api)
    implementation(projects.libraries.push.api)
    implementation(projects.libraries.pushproviders.api)
+    implementation(projects.libraries.sessionStorage.api)
    implementation(projects.libraries.uiUtils)
    implementation(projects.libraries.fullscreenintent.api)
    implementation(projects.features.rageshake.api)
--- a/features/preferences/test/build.gradle.kts
+++ b/features/preferences/test/build.gradle.kts
@ -14,6 +14,7 @@ android {
 }

 dependencies {
+    implementation(projects.libraries.architecture)
    implementation(projects.features.preferences.api)
    implementation(projects.tests.testutils)
 }
--- a/features/signedout/impl/build.gradle.kts
+++ b/features/signedout/impl/build.gradle.kts
@ -27,6 +27,7 @@ dependencies {
    implementation(projects.libraries.matrix.api)
    implementation(projects.libraries.matrixui)
    implementation(projects.libraries.designsystem)
+    implementation(projects.libraries.sessionStorage.api)
    implementation(projects.libraries.uiStrings)

    testCommonDependencies(libs)
--- a/libraries/matrix/api/build.gradle.kts
+++ b/libraries/matrix/api/build.gradle.kts
@ -49,9 +49,9 @@ dependencies {
    implementation(projects.libraries.core)
    implementation(projects.services.analytics.api)
    implementation(libs.serialization.json)
-    api(projects.libraries.sessionStorage.api)
+    implementation(projects.libraries.sessionStorage.api)
    implementation(libs.coroutines.core)
-    api(projects.libraries.architecture)
+    implementation(projects.libraries.architecture)

    testCommonDependencies(libs)
    testImplementation(projects.libraries.matrix.test)
--- a/libraries/matrix/impl/build.gradle.kts
+++ b/libraries/matrix/impl/build.gradle.kts
@ -32,10 +32,12 @@ dependencies {

    implementation(projects.appconfig)
    implementation(projects.libraries.androidutils)
+    implementation(projects.libraries.architecture)
    implementation(projects.libraries.di)
    implementation(projects.libraries.featureflag.api)
    implementation(projects.libraries.network)
    implementation(projects.libraries.preferences.api)
+    implementation(projects.libraries.sessionStorage.api)
    implementation(projects.libraries.workmanager.api)
    implementation(projects.services.analytics.api)
    implementation(projects.services.toolbox.api)
--- a/libraries/matrix/test/build.gradle.kts
+++ b/libraries/matrix/test/build.gradle.kts
@ -19,6 +19,7 @@ dependencies {
    api(projects.libraries.matrix.api)
    api(libs.coroutines.core)
    implementation(libs.coroutines.test)
+    implementation(projects.libraries.architecture)
    implementation(projects.services.analytics.api)
    implementation(projects.tests.testutils)
    implementation(libs.kotlinx.collections.immutable)
--- a/libraries/matrixmedia/impl/build.gradle.kts
+++ b/libraries/matrixmedia/impl/build.gradle.kts
@ -19,8 +19,10 @@ android {
 setupDependencyInjection()

 dependencies {
+    implementation(projects.libraries.architecture)
    implementation(projects.libraries.matrix.api)
    implementation(projects.libraries.matrixmedia.api)
+    implementation(projects.libraries.sessionStorage.api)
    implementation(projects.libraries.designsystem)
    implementation(libs.coil.compose)
    implementation(libs.coil.gif)
--- a/libraries/mediaupload/test/build.gradle.kts
+++ b/libraries/mediaupload/test/build.gradle.kts
@ -15,6 +15,7 @@ android {
 }

 dependencies {
+    implementation(libs.coroutines.core)
    api(projects.libraries.mediaupload.api)
    implementation(projects.libraries.core)
    implementation(projects.tests.testutils)
--- a/libraries/mediaviewer/test/build.gradle.kts
+++ b/libraries/mediaviewer/test/build.gradle.kts
@ -18,6 +18,7 @@ android {

 dependencies {
    api(projects.libraries.mediaviewer.impl)
+    implementation(projects.libraries.architecture)
    implementation(projects.libraries.core)
    implementation(projects.tests.testutils)
    implementation(projects.libraries.matrix.api)
--- a/libraries/preferences/impl/build.gradle.kts
+++ b/libraries/preferences/impl/build.gradle.kts
@ -25,4 +25,5 @@ dependencies {
    implementation(projects.libraries.di)
    implementation(projects.libraries.core)
    implementation(projects.libraries.matrix.api)
+    implementation(projects.libraries.sessionStorage.api)
 }
--- a/libraries/pushproviders/firebase/build.gradle.kts
+++ b/libraries/pushproviders/firebase/build.gradle.kts
@ -57,6 +57,7 @@ dependencies {
    implementation(projects.libraries.di)
    implementation(projects.libraries.matrix.api)
    implementation(projects.libraries.push.api)
+    implementation(projects.libraries.sessionStorage.api)
    implementation(projects.libraries.uiStrings)
    implementation(projects.libraries.troubleshoot.api)
    implementation(projects.services.toolbox.api)
--- a/libraries/recentemojis/impl/build.gradle.kts
+++ b/libraries/recentemojis/impl/build.gradle.kts
@ -21,6 +21,7 @@ setupDependencyInjection()

 dependencies {
    api(projects.libraries.recentemojis.api)
+    implementation(projects.libraries.architecture)
    implementation(projects.libraries.matrix.api)
    implementation(libs.kotlinx.collections.immutable)
    implementation(libs.matrix.emojibase.bindings)
--- a/libraries/session-storage/test/build.gradle.kts
+++ b/libraries/session-storage/test/build.gradle.kts
@ -14,6 +14,7 @@ android {
 }

 dependencies {
+    implementation(libs.coroutines.core)
    implementation(projects.libraries.matrix.api)
    implementation(projects.libraries.sessionStorage.api)
 }
--- a/libraries/voiceplayer/api/build.gradle.kts
+++ b/libraries/voiceplayer/api/build.gradle.kts
@ -16,5 +16,6 @@ android {
 dependencies {
    implementation(libs.androidx.annotationjvm)
    implementation(libs.coroutines.core)
+    implementation(projects.libraries.architecture)
    implementation(projects.libraries.matrix.api)
 }
--- a/libraries/voiceplayer/impl/build.gradle.kts
+++ b/libraries/voiceplayer/impl/build.gradle.kts
@ -21,6 +21,7 @@ setupDependencyInjection()
 dependencies {
    api(projects.libraries.voiceplayer.api)

+    implementation(projects.libraries.architecture)
    implementation(projects.libraries.audio.api)
    implementation(projects.libraries.core)
    implementation(projects.libraries.di)
--- a/libraries/workmanager/api/build.gradle.kts
+++ b/libraries/workmanager/api/build.gradle.kts
@ -15,6 +15,6 @@ android {

 dependencies {
    api(libs.androidx.workmanager.runtime)
-
+    implementation(projects.libraries.architecture)
    implementation(projects.libraries.matrix.api)
 }
--- a/libraries/workmanager/impl/build.gradle.kts
+++ b/libraries/workmanager/impl/build.gradle.kts
@ -23,6 +23,7 @@ dependencies {
    implementation(projects.libraries.core)
    implementation(projects.libraries.matrix.api)
    implementation(projects.libraries.di)
+    implementation(projects.libraries.sessionStorage.api)

    testCommonDependencies(libs, false)
    testImplementation(projects.libraries.sessionStorage.test)
--- a/services/analyticsproviders/sentry/build.gradle.kts
+++ b/services/analyticsproviders/sentry/build.gradle.kts
@ -50,6 +50,8 @@ setupDependencyInjection()

 dependencies {
    implementation(libs.sentry)
+    implementation(libs.coroutines.core)
+    implementation(libs.androidx.annotationjvm)
    implementation(projects.libraries.core)
    implementation(projects.libraries.di)
    implementation(projects.libraries.matrix.api)