Upgrade Material3 Compose to 1.2.0-beta02 (#2247)

* Upgrade Material3 Compose to `1.2.0-beta02`.

There is also a constraint on a transitive Compose Foundation dependency version (1.6.0-beta02) that fixes the timeline scrolling issue.

---------

Co-authored-by: ElementBot <benoitm+elementbot@element.io>

changelog.d/+upgrade-material3-compose-to-1.2.0-beta02.misc

@@ -0,0 +1,3 @@
+Upgrade Material3 Compose to `1.2.0-beta02`.
+
+There is also a constraint on a transitive Compose Foundation dependency version (1.6.0-beta02) that fixes the timeline scrolling issue.

gradle/libs.versions.toml

@@ -93,7 +93,8 @@ androidx_preference = "androidx.preference:preference:1.2.1"
 androidx_webkit = "androidx.webkit:webkit:1.9.0"
 
 androidx_compose_bom = { module = "androidx.compose:compose-bom", version.ref = "compose_bom" }
-androidx_compose_material3 = "androidx.compose.material3:material3:1.2.0-alpha11" # Keep using alpha11 for now as it breaks timeline scrolling a bit.
+# 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-beta02"
 androidx_compose_ui = { module = "androidx.compose.ui:ui" }
 androidx_compose_ui_tooling = { module = "androidx.compose.ui:ui-tooling" }
 androidx_compose_ui_tooling_preview = { module = "androidx.compose.ui:ui-tooling-preview" }

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/tooltip/PlainTooltip.kt

@@ -16,6 +16,7 @@
 
 package io.element.android.libraries.designsystem.components.tooltip
 
+import androidx.compose.material3.CaretScope
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.TooltipDefaults
 import androidx.compose.runtime.Composable
@@ -27,7 +28,7 @@ import androidx.compose.material3.PlainTooltip as M3PlainTooltip
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun PlainTooltip(
+fun CaretScope.PlainTooltip(
     modifier: Modifier = Modifier,
     contentColor: Color = ElementTheme.colors.textOnSolidPrimary,
     containerColor: Color = ElementTheme.colors.bgActionPrimaryRest,

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/tooltip/TooltipBox.kt

@@ -16,6 +16,7 @@
 
 package io.element.android.libraries.designsystem.components.tooltip
 
+import androidx.compose.material3.CaretScope
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.TooltipState
 import androidx.compose.runtime.Composable
@@ -27,7 +28,7 @@ import androidx.compose.material3.TooltipBox as M3TooltipBox
 @Composable
 fun TooltipBox(
     positionProvider: PopupPositionProvider,
-    tooltip: @Composable () -> Unit,
+    tooltip: @Composable CaretScope.() -> Unit,
     state: TooltipState,
     modifier: Modifier = Modifier,
     focusable: Boolean = true,

plugins/src/main/kotlin/extension/DependencyHandleScope.kt

@@ -17,13 +17,24 @@
 package extension
 
 import org.gradle.accessors.dm.LibrariesForLibs
+import org.gradle.api.Action
+import org.gradle.api.artifacts.ExternalModuleDependency
 import org.gradle.api.logging.Logger
+import org.gradle.api.provider.Provider
 import org.gradle.kotlin.dsl.DependencyHandlerScope
+import org.gradle.kotlin.dsl.closureOf
+import org.gradle.kotlin.dsl.exclude
 import org.gradle.kotlin.dsl.project
 import java.io.File
 
 private fun DependencyHandlerScope.implementation(dependency: Any) = dependencies.add("implementation", dependency)
 
+// Implementation + config block
+private fun DependencyHandlerScope.implementation(
+    dependency: Any,
+    config: Action<ExternalModuleDependency>
+) = dependencies.add("implementation",  dependency, closureOf<ExternalModuleDependency> { config.execute(this) })
+
 private fun DependencyHandlerScope.androidTestImplementation(dependency: Any) = dependencies.add("androidTestImplementation", dependency)
 
 private fun DependencyHandlerScope.debugImplementation(dependency: Any) = dependencies.add("debugImplementation", dependency)
@@ -45,6 +56,16 @@ 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)