Merge pull request #5674 from element-hq/feature/bma/androidDependencies

Move dependencies block out of the android block.

libraries/compound/build.gradle.kts

@@ -18,12 +18,12 @@ android {
     testOptions {
         unitTests.isIncludeAndroidResources = true
     }
-
-    dependencies {
-        implementation(libs.showkase)
-        testCommonDependencies(libs)
-        testImplementation(libs.test.roborazzi)
-        testImplementation(libs.test.roborazzi.compose)
-        testImplementation(libs.test.roborazzi.junit)
-    }
+}
+
+dependencies {
+    implementation(libs.showkase)
+    testCommonDependencies(libs)
+    testImplementation(libs.test.roborazzi)
+    testImplementation(libs.test.roborazzi.compose)
+    testImplementation(libs.test.roborazzi.junit)
 }

libraries/cryptography/test/build.gradle.kts

@@ -11,8 +11,8 @@ plugins {
 
 android {
     namespace = "io.element.android.libraries.cryptography.test"
-
-    dependencies {
-        api(projects.libraries.cryptography.api)
-    }
+}
+
+dependencies {
+    api(projects.libraries.cryptography.api)
 }

libraries/dateformatter/api/build.gradle.kts

@@ -13,8 +13,8 @@ plugins {
 
 android {
     namespace = "io.element.android.libraries.dateformatter.api"
-
-    dependencies {
-        testCommonDependencies(libs)
-    }
+}
+
+dependencies {
+    testCommonDependencies(libs)
 }

libraries/dateformatter/impl/build.gradle.kts

@@ -30,19 +30,19 @@ android {
             )
         }
     }
-
-    dependencies {
-        implementation(projects.libraries.core)
-        implementation(projects.libraries.designsystem)
-        implementation(projects.libraries.di)
-        implementation(projects.libraries.uiStrings)
-        implementation(projects.services.toolbox.api)
-
-        api(projects.libraries.dateformatter.api)
-        api(libs.datetime)
-
-        testCommonDependencies(libs, true)
-        testImplementation(projects.libraries.dateformatter.test)
-        testImplementation(projects.services.toolbox.test)
-    }
+}
+
+dependencies {
+    implementation(projects.libraries.core)
+    implementation(projects.libraries.designsystem)
+    implementation(projects.libraries.di)
+    implementation(projects.libraries.uiStrings)
+    implementation(projects.services.toolbox.api)
+
+    api(projects.libraries.dateformatter.api)
+    api(libs.datetime)
+
+    testCommonDependencies(libs, true)
+    testImplementation(projects.libraries.dateformatter.test)
+    testImplementation(projects.services.toolbox.test)
 }

libraries/dateformatter/test/build.gradle.kts

@@ -11,9 +11,9 @@ plugins {
 
 android {
     namespace = "io.element.android.libraries.dateformatter.test"
-
-    dependencies {
-        api(projects.libraries.dateformatter.api)
-        api(libs.datetime)
-    }
+}
+
+dependencies {
+    api(projects.libraries.dateformatter.api)
+    api(libs.datetime)
 }

libraries/designsystem/build.gradle.kts

@@ -25,24 +25,24 @@ android {
             consumerProguardFiles("consumer-rules.pro")
         }
     }
-
-    dependencies {
-        api(projects.libraries.compound)
-
-        implementation(libs.androidx.compose.material3.windowsizeclass)
-        implementation(libs.androidx.compose.material3.adaptive)
-        implementation(libs.coil.compose)
-        implementation(libs.vanniktech.blurhash)
-        implementation(projects.libraries.androidutils)
-        implementation(projects.libraries.architecture)
-        implementation(projects.libraries.core)
-        implementation(projects.libraries.preferences.api)
-        implementation(projects.libraries.testtags)
-        implementation(projects.libraries.uiStrings)
-
-        ksp(libs.showkase.processor)
-        implementation(libs.showkase)
-
-        testCommonDependencies(libs)
-    }
+}
+
+dependencies {
+    api(projects.libraries.compound)
+
+    implementation(libs.androidx.compose.material3.windowsizeclass)
+    implementation(libs.androidx.compose.material3.adaptive)
+    implementation(libs.coil.compose)
+    implementation(libs.vanniktech.blurhash)
+    implementation(projects.libraries.androidutils)
+    implementation(projects.libraries.architecture)
+    implementation(projects.libraries.core)
+    implementation(projects.libraries.preferences.api)
+    implementation(projects.libraries.testtags)
+    implementation(projects.libraries.uiStrings)
+
+    ksp(libs.showkase.processor)
+    implementation(libs.showkase)
+
+    testCommonDependencies(libs)
 }

libraries/featureflag/test/build.gradle.kts

@@ -11,11 +11,11 @@ plugins {
 
 android {
     namespace = "io.element.android.libraries.featureflag.test"
-
-    dependencies {
-        api(projects.libraries.featureflag.api)
-        implementation(projects.libraries.core)
-        implementation(projects.libraries.matrix.test)
-        implementation(libs.coroutines.core)
-    }
+}
+
+dependencies {
+    api(projects.libraries.featureflag.api)
+    implementation(projects.libraries.core)
+    implementation(projects.libraries.matrix.test)
+    implementation(libs.coroutines.core)
 }

libraries/mediapickers/api/build.gradle.kts

@@ -13,12 +13,12 @@ plugins {
 
 android {
     namespace = "io.element.android.libraries.mediapickers.api"
-
-    dependencies {
-        implementation(projects.libraries.uiStrings)
-        implementation(projects.libraries.core)
-        implementation(projects.libraries.di)
-
-        testCommonDependencies(libs)
-    }
+}
+
+dependencies {
+    implementation(projects.libraries.uiStrings)
+    implementation(projects.libraries.core)
+    implementation(projects.libraries.di)
+
+    testCommonDependencies(libs)
 }

libraries/mediapickers/test/build.gradle.kts

@@ -15,10 +15,10 @@ setupDependencyInjection()
 
 android {
     namespace = "io.element.android.libraries.mediapickers.test"
-
-    dependencies {
-        implementation(projects.libraries.core)
-        implementation(projects.libraries.di)
-        api(projects.libraries.mediapickers.api)
-    }
+}
+
+dependencies {
+    implementation(projects.libraries.core)
+    implementation(projects.libraries.di)
+    api(projects.libraries.mediapickers.api)
 }

libraries/preferences/test/build.gradle.kts

@@ -11,12 +11,12 @@ plugins {
 
 android {
     namespace = "io.element.android.libraries.preferences.test"
-
-    dependencies {
-        api(projects.libraries.preferences.api)
-        implementation(projects.libraries.matrix.api)
-        implementation(projects.tests.testutils)
-        implementation(libs.coroutines.core)
-        implementation(libs.androidx.datastore.preferences)
-    }
+}
+
+dependencies {
+    api(projects.libraries.preferences.api)
+    implementation(projects.libraries.matrix.api)
+    implementation(projects.tests.testutils)
+    implementation(libs.coroutines.core)
+    implementation(libs.androidx.datastore.preferences)
 }

libraries/previewutils/build.gradle.kts

@@ -11,11 +11,11 @@ plugins {
 
 android {
     namespace = "io.element.android.libraries.previewutils"
-
-    dependencies {
-        implementation(projects.libraries.designsystem)
-        implementation(projects.libraries.matrix.api)
-
-        implementation(libs.kotlinx.collections.immutable)
-    }
+}
+
+dependencies {
+    implementation(projects.libraries.designsystem)
+    implementation(projects.libraries.matrix.api)
+
+    implementation(libs.kotlinx.collections.immutable)
 }

libraries/ui-utils/build.gradle.kts

@@ -13,11 +13,11 @@ plugins {
 
 android {
     namespace = "io.element.android.libraries.ui.utils"
-
-    dependencies {
-        implementation(projects.libraries.androidutils)
-        implementation(projects.services.toolbox.impl)
-
-        testCommonDependencies(libs)
-    }
+}
+
+dependencies {
+    implementation(projects.libraries.androidutils)
+    implementation(projects.services.toolbox.impl)
+
+    testCommonDependencies(libs)
 }