From c6ae132d6a0aeeb7045c75180a90c8e8028e172e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Thu, 1 Feb 2024 09:06:37 +0100 Subject: [PATCH] Remove Compose Foundation version pinning workaround --- changelog.d/+remove-compose-foundation-workaround.misc | 1 + gradle/libs.versions.toml | 1 - .../src/main/kotlin/extension/DependencyHandleScope.kt | 10 ---------- 3 files changed, 1 insertion(+), 11 deletions(-) create mode 100644 changelog.d/+remove-compose-foundation-workaround.misc diff --git a/changelog.d/+remove-compose-foundation-workaround.misc b/changelog.d/+remove-compose-foundation-workaround.misc new file mode 100644 index 0000000000..480a288426 --- /dev/null +++ b/changelog.d/+remove-compose-foundation-workaround.misc @@ -0,0 +1 @@ +Remove Compose Foundation version pinning workaround. This was done to avoid a bug introduced in the default foundation version used by the material3 library, but that has been already been fixed. diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 591113eb1b..68c2119f55 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -93,7 +93,6 @@ androidx_preference = "androidx.preference:preference:1.2.1" androidx_webkit = "androidx.webkit:webkit:1.10.0" androidx_compose_bom = { module = "androidx.compose:compose-bom", version.ref = "compose_bom" } -# When Material3 updates its transitive Compose dependencies, take a look at the constraints in `DependencyHandleScope.kt`. We may be able to remove the workaround there. androidx_compose_material3 = "androidx.compose.material3:material3:1.2.0-rc01" androidx_compose_ui = { module = "androidx.compose.ui:ui" } androidx_compose_ui_tooling = { module = "androidx.compose.ui:ui-tooling" } diff --git a/plugins/src/main/kotlin/extension/DependencyHandleScope.kt b/plugins/src/main/kotlin/extension/DependencyHandleScope.kt index 1ba4b60b4d..cc254511bd 100644 --- a/plugins/src/main/kotlin/extension/DependencyHandleScope.kt +++ b/plugins/src/main/kotlin/extension/DependencyHandleScope.kt @@ -56,16 +56,6 @@ fun DependencyHandlerScope.composeDependencies(libs: LibrariesForLibs) { implementation(libs.androidx.compose.ui) implementation(libs.androidx.compose.material) implementation(libs.androidx.compose.material3) - - // Remove these constraints once `material3` updates its internal dependencies - constraints { - implementation("androidx.compose.foundation:foundation:1.6.0-beta02") { - because("The transitive version inside `material3` (1.6.0-beta01) causes a scrolling issue. " + - "See https://android.googlesource.com/platform/frameworks/support/+/2d15876146ccf201f7e15cacc78bfca762060624" - ) - } - } - implementation(libs.androidx.compose.material.icons) implementation(libs.androidx.compose.ui.tooling.preview) implementation(libs.androidx.activity.compose)