From fdec9281c71d0ebc46d222d917b50369944bbbb8 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 10 Oct 2023 11:49:41 +0200 Subject: [PATCH 1/3] Remove dependency on `com.google.android.material:material` --- gradle/libs.versions.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a5ce502f9c..7bc2e84733 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,7 +9,6 @@ ksp = "1.9.10-1.0.13" molecule = "1.2.1" # AndroidX -material = "1.9.0" core = "1.12.0" datastore = "1.0.0" constraintlayout = "2.1.4" @@ -69,7 +68,6 @@ kotlin_gradle_plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", v google_firebase_bom = "com.google.firebase:firebase-bom:32.3.1" # AndroidX -androidx_material = { module = "com.google.android.material:material", version.ref = "material" } androidx_core = { module = "androidx.core:core", version.ref = "core" } androidx_corektx = { module = "androidx.core:core-ktx", version.ref = "core" } androidx_datastore_preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastore" } From 98ec390baf74d64cb103c1c84fc5bc72eaf105b5 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 10 Oct 2023 11:50:04 +0200 Subject: [PATCH 2/3] Remove obsolete comment. --- gradle/libs.versions.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7bc2e84733..ba451365ab 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -92,8 +92,6 @@ androidx_preference = "androidx.preference:preference:1.2.1" androidx_webkit = "androidx.webkit:webkit:1.8.0" androidx_compose_bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose_bom" } -# Warning: issue on alpha07, make sure this is working when upgrading -# Context in https://github.com/vector-im/element-x-android/pull/1239#issuecomment-1711500332 androidx_compose_material3 = "androidx.compose.material3:material3:1.2.0-alpha09" # Coroutines From 632389daa9884495baff718eea40b52d95fe7686 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 10 Oct 2023 13:48:10 +0200 Subject: [PATCH 3/3] Remove not used dependencies to some accompanist libraries. --- features/logout/impl/build.gradle.kts | 1 - features/messages/impl/build.gradle.kts | 2 -- features/preferences/impl/build.gradle.kts | 1 - features/roomlist/impl/build.gradle.kts | 1 - gradle/libs.versions.toml | 4 ---- 5 files changed, 9 deletions(-) diff --git a/features/logout/impl/build.gradle.kts b/features/logout/impl/build.gradle.kts index 52a9f76b41..f5ee8dd951 100644 --- a/features/logout/impl/build.gradle.kts +++ b/features/logout/impl/build.gradle.kts @@ -38,7 +38,6 @@ dependencies { implementation(projects.libraries.testtags) implementation(projects.libraries.uiStrings) implementation(projects.libraries.dateformatter.api) - implementation(libs.accompanist.placeholder) api(projects.features.logout.api) ksp(libs.showkase.processor) diff --git a/features/messages/impl/build.gradle.kts b/features/messages/impl/build.gradle.kts index 058dafaf1f..e886a3aeaa 100644 --- a/features/messages/impl/build.gradle.kts +++ b/features/messages/impl/build.gradle.kts @@ -54,13 +54,11 @@ dependencies { implementation(projects.services.analytics.api) implementation(libs.coil.compose) implementation(libs.datetime) - implementation(libs.accompanist.flowlayout) implementation(libs.jsoup) implementation(libs.androidx.constraintlayout) implementation(libs.androidx.constraintlayout.compose) implementation(libs.androidx.media3.exoplayer) implementation(libs.androidx.media3.ui) - implementation(libs.accompanist.systemui) implementation(libs.vanniktech.blurhash) implementation(libs.telephoto.zoomableimage) implementation(libs.matrix.emojibase.bindings) diff --git a/features/preferences/impl/build.gradle.kts b/features/preferences/impl/build.gradle.kts index f3b41859d9..a227d24b8b 100644 --- a/features/preferences/impl/build.gradle.kts +++ b/features/preferences/impl/build.gradle.kts @@ -55,7 +55,6 @@ dependencies { implementation(projects.services.analytics.api) implementation(projects.services.toolbox.api) implementation(libs.datetime) - implementation(libs.accompanist.placeholder) implementation(libs.coil.compose) implementation(libs.androidx.browser) implementation(libs.androidx.datastore.preferences) diff --git a/features/roomlist/impl/build.gradle.kts b/features/roomlist/impl/build.gradle.kts index 123ae04503..17817ebc91 100644 --- a/features/roomlist/impl/build.gradle.kts +++ b/features/roomlist/impl/build.gradle.kts @@ -53,7 +53,6 @@ dependencies { implementation(projects.features.networkmonitor.api) implementation(projects.features.leaveroom.api) implementation(projects.services.analytics.api) - implementation(libs.accompanist.placeholder) api(projects.features.roomlist.api) ksp(libs.showkase.processor) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ba451365ab..9995c539fa 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -99,12 +99,8 @@ coroutines_core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", ve coroutines_test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" } # Accompanist -accompanist_animation = { module = "com.google.accompanist:accompanist-navigation-animation", version.ref = "accompanist" } accompanist_permission = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } -accompanist_material = { module = "com.google.accompanist:accompanist-navigation-material", version.ref = "accompanist" } accompanist_systemui = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" } -accompanist_placeholder = { module = "com.google.accompanist:accompanist-placeholder-material", version.ref = "accompanist" } -accompanist_flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" } # Libraries squareup_seismic = "com.squareup:seismic:1.0.3"