Sulkta-Coop/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove Compose Foundation version pinning workaround

Browse source
This commit is contained in:
Jorge Martín 2024-02-01 09:06:37 +01:00
parent d4cde9bf59
commit f582128250
3 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/+remove-compose-foundation-workaround.misc Normal file
View file

@ -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.

1
gradle/libs.versions.toml
View file

@ -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" }

10
plugins/src/main/kotlin/extension/DependencyHandleScope.kt
View file

@ -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)