Replace internal platform-specific helpers with unified HostDefaultProviderImpl (JetBrains#2874)

- Removed `findDefaultNavigationEventDispatcherOwner` and
`findComposeDefaultViewModelStoreOwner`.
- Deprecated and replaced obsolete CompositionLocals with
lifecycle-runtime-compose equivalents.
- Updated dependencies to align with `navigationevent-compose` and
`lifecycle-viewmodel-compose`.
- Simplified host default provider initialization through
`HostDefaultProviderImpl`.

Describe proposed changes and the issue being fixed

Fixes https://youtrack.jetbrains.com/issue/CMP-9752

## Release Notes
N/A

Author: terrakok

compose/foundation/foundation/build.gradle

@@ -54,6 +54,7 @@ androidXMultiplatform {
     configureDarwinFlags()
 
     sourceSets {
+        def navigationEventVersion = project.findProperty('artifactRedirection.version.androidx.navigationevent')
         commonMain.dependencies {
             api("androidx.collection:collection:1.5.0")
             api(project(":compose:animation:animation"))
@@ -67,9 +68,9 @@ androidXMultiplatform {
         commonTest.dependencies {
             implementation(libs.kotlinTest)
             implementation(libs.kotlinCoroutinesTest)
-            implementation("androidx.navigationevent:navigationevent:1.0.1")
-            implementation("androidx.navigationevent:navigationevent-testing:1.0.1")
-            implementation("org.jetbrains.androidx.navigationevent:navigationevent-compose:1.0.1")
+            implementation("androidx.navigationevent:navigationevent:$navigationEventVersion")
+            implementation("androidx.navigationevent:navigationevent-testing:$navigationEventVersion")
+            implementation("androidx.navigationevent:navigationevent-compose:$navigationEventVersion")
         }
 
         androidMain.dependencies {

compose/material/material/build.gradle

@@ -66,7 +66,7 @@ androidXMultiplatform {
             implementation(libs.kotlinTest)
             implementation(project(":compose:ui:ui-test"))
             implementation("androidx.navigationevent:navigationevent-testing:$navigationEventVersion")
-            implementation("org.jetbrains.androidx.navigationevent:navigationevent-compose:1.0.1")
+            implementation("androidx.navigationevent:navigationevent-compose:$navigationEventVersion")
         }
 
         androidMain.dependencies {

compose/material3/adaptive/adaptive-navigation3/build.gradle

@@ -47,11 +47,12 @@ androidXMultiplatform {
     defaultPlatform(PlatformIdentifier.ANDROID)
 
     sourceSets {
+        def navigationEventVersion = project.findProperty('artifactRedirection.version.androidx.navigationevent')
         commonMain.dependencies {
             api(project(":compose:material3:adaptive:adaptive-navigation"))
             api(project(":navigation3:navigation3-ui"))
             implementation("androidx.collection:collection:1.5.0")
-            implementation("org.jetbrains.androidx.navigationevent:navigationevent-compose:1.0.1")
+            implementation("androidx.navigationevent:navigationevent-compose:$navigationEventVersion")
         }
 
         androidMain.dependencies {

compose/material3/material3/build.gradle

@@ -124,7 +124,7 @@ androidXMultiplatform {
                 implementation(project(":compose:runtime:runtime"))
                 def navigationEventVersion = project.findProperty('artifactRedirection.version.androidx.navigationevent')
                 implementation("androidx.navigationevent:navigationevent-testing:$navigationEventVersion")
-                implementation("org.jetbrains.androidx.navigationevent:navigationevent-compose:1.0.1")
+                implementation("androidx.navigationevent:navigationevent-compose:$navigationEventVersion")
             }
         }
 

compose/ui/ui-backhandler/build.gradle

@@ -58,11 +58,13 @@ androidXMultiplatform {
             }
         }
 
+        def navigationEventVersion = project.findProperty('artifactRedirection.version.androidx.navigationevent')
+
         // TODO: Align naming: nonAndroidMain
         jbMain {
             dependsOn(commonMain)
             dependencies {
-                implementation("androidx.navigationevent:navigationevent:1.0.1")
+                implementation("androidx.navigationevent:navigationevent-compose:$navigationEventVersion")
             }
         }
 

compose/ui/ui-backhandler/src/jbMain/kotlin/androidx/compose/ui/backhandler/BackHandler.jb.kt

@@ -23,16 +23,11 @@ import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.currentCompositeKeyHashCode
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.InternalComposeUiApi
-import androidx.navigationevent.NavigationEventDispatcherOwner
+import androidx.navigationevent.compose.LocalNavigationEventDispatcherOwner
 import kotlinx.coroutines.flow.Flow
 
-@InternalComposeUiApi
-val LocalCompatNavigationEventDispatcherOwner =
-    staticCompositionLocalOf<NavigationEventDispatcherOwner?> { null }
-
 @OptIn(InternalComposeUiApi::class)
 @Deprecated("Use NavigationEventHandler instead")
 @ExperimentalComposeUiApi
@@ -41,8 +36,8 @@ actual fun PredictiveBackHandler(
     enabled: Boolean,
     onBack: suspend (progress: Flow<BackEventCompat>) -> Unit
 ) {
-    val owner = LocalCompatNavigationEventDispatcherOwner.current ?: error(
-        "No NavigationEventDispatcher was provided via LocalCompatNavigationEventDispatcherOwner"
+    val owner = LocalNavigationEventDispatcherOwner.current ?: error(
+        "No NavigationEventDispatcher was provided via LocalNavigationEventDispatcherOwner"
     )
     val dispatcher = owner.navigationEventDispatcher
     val coroutineScope = rememberCoroutineScope()
@@ -63,8 +58,8 @@ actual fun PredictiveBackHandler(
 @ExperimentalComposeUiApi
 @Composable
 actual fun BackHandler(enabled: Boolean, onBack: () -> Unit) {
-    val owner = LocalCompatNavigationEventDispatcherOwner.current ?: error(
-        "No NavigationEventDispatcher was provided via LocalCompatNavigationEventDispatcherOwner"
+    val owner = LocalNavigationEventDispatcherOwner.current ?: error(
+        "No NavigationEventDispatcher was provided via LocalNavigationEventDispatcherOwner"
     )
     val dispatcher = owner.navigationEventDispatcher
     val compositeKey = currentCompositeKeyHashCode

compose/ui/ui/api/desktop/ui.api

@@ -3744,7 +3744,7 @@ public final class androidx/compose/ui/platform/CompositionLocalsKt {
 }
 
 public final class androidx/compose/ui/platform/CompositionLocals_skikoKt {
-	public static final fun getLocalLifecycleOwner ()Landroidx/compose/runtime/ProvidableCompositionLocal;
+	public static final synthetic fun getLocalLifecycleOwner ()Landroidx/compose/runtime/ProvidableCompositionLocal;
 }
 
 public final class androidx/compose/ui/platform/DefaultViewConfiguration : androidx/compose/ui/platform/ViewConfiguration {

compose/ui/ui/build.gradle

@@ -90,8 +90,8 @@ androidXMultiplatform {
             api("org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.9.6")
             api("androidx.savedstate:savedstate-compose:1.4.0")
 
-            implementation("org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.9.6")
-            implementation("org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.6")
+            implementation("org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose:2.11.0-alpha01")
+            implementation("org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-savedstate:2.11.0-alpha01")
         }
 
         commonTest.dependencies {
@@ -198,6 +198,7 @@ androidXMultiplatform {
             implementation(project(":compose:test-utils"))
         }
 
+        def navigationEventVersion = project.findProperty('artifactRedirection.version.androidx.navigationevent')
         // TODO: Align naming: nonAndroidMain
         skikoMain {
             dependsOn(commonMain)
@@ -209,12 +210,7 @@ androidXMultiplatform {
 
                 // Keep this dependency for compatibility due to https://youtrack.jetbrains.com/issue/KT-60874
                 implementation(project(":compose:ui:ui-backhandler"))
-
-                // Use direct dependency to AOSP's artifact instead of using project reference
-                // because this module supports all KMP platforms from the beginning.
-                // Project dependency (commented out version) is required for `integration` branch setup
-                // implementation(project(":navigationevent:navigationevent"))
-                implementation("androidx.navigationevent:navigationevent:1.0.1")
+                implementation("androidx.navigationevent:navigationevent-compose:$navigationEventVersion")
             }
         }
 
@@ -225,7 +221,6 @@ androidXMultiplatform {
                 implementation(project(":compose:material:material"))
                 implementation(project(":compose:foundation:foundation"))
                 implementation(project(":compose:ui:ui-test"))
-                implementation("org.jetbrains.androidx.navigationevent:navigationevent-compose:1.0.1")
             }
         }
 

compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/platform/CompositionLocals.skiko.kt

@@ -19,19 +19,13 @@ package androidx.compose.ui.platform
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.HostDefaultKey
-import androidx.compose.runtime.HostDefaultProvider
 import androidx.compose.runtime.InternalComposeApi
 import androidx.compose.runtime.LocalHostDefaultProvider
 import androidx.compose.runtime.ProvidedValue
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.retain.LocalRetainedValuesStore
 import androidx.compose.runtime.saveable.LocalSaveableStateRegistry
 import androidx.compose.runtime.staticCompositionLocalOf
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.InternalComposeUiApi
-import androidx.compose.ui.backhandler.LocalCompatNavigationEventDispatcherOwner
-import androidx.compose.ui.node.Owner
 import androidx.lifecycle.LifecycleOwner
 import androidx.savedstate.compose.LocalSavedStateRegistryOwner
 
@@ -41,6 +35,7 @@ import androidx.savedstate.compose.LocalSavedStateRegistryOwner
 @Deprecated(
     "Moved to lifecycle-runtime-compose library in androidx.lifecycle.compose package.",
     ReplaceWith("androidx.lifecycle.compose.LocalLifecycleOwner"),
+    level = DeprecationLevel.HIDDEN
 )
 actual val LocalLifecycleOwner get() = androidx.lifecycle.compose.LocalLifecycleOwner
 
@@ -63,18 +58,6 @@ val LocalPlatformWindowInsets = staticCompositionLocalOf<PlatformWindowInsets> {
     error("CompositionLocal LocalPlatformWindowInsets not present")
 }
 
-private val PlatformArchitectureComponentsOwner.values: Array<ProvidedValue<*>>
-    get() {
-        val providedValues = mutableListOf(
-            androidx.lifecycle.compose.LocalLifecycleOwner provides lifecycleOwner,
-            LocalInternalNavigationEventDispatcherOwner provides navigationEventDispatcherOwner,
-            LocalCompatNavigationEventDispatcherOwner provides navigationEventDispatcherOwner,
-            LocalSavedStateRegistryOwner provides savedStateRegistryOwner,
-        )
-        viewModelStoreOwner?.let { providedValues.add(LocalInternalViewModelStoreOwner provides it) }
-        return providedValues.toTypedArray()
-    }
-
 @OptIn(InternalComposeApi::class)
 @Composable
 internal fun ProvidePlatformCompositionLocals(
@@ -94,21 +77,16 @@ internal fun ProvidePlatformCompositionLocals(
         onDispose { registry.dispose() }
     }
 
-    // TODO: https://youtrack.jetbrains.com/issue/CMP-9752/Properly-implement-HostDefaultProvider-and-LocalHostDefaultProvider-for-CMP
     val hostDefaultProvider = remember(platformContext) {
-        object : HostDefaultProvider {
-            @Suppress("UNCHECKED_CAST")
-            override fun <T> getHostDefault(key: HostDefaultKey<T>): T {
-                return platformContext.architectureComponentsOwner as T
-            }
-        }
+        HostDefaultProviderImpl(platformContext)
     }
 
     CompositionLocalProvider(
         *values,
         LocalPlatformScreenReader provides platformContext.screenReader,
         LocalPlatformWindowInsets provides platformContext.windowInsets,
-        *platformContext.architectureComponentsOwner.values,
+        androidx.lifecycle.compose.LocalLifecycleOwner provides platformContext.architectureComponentsOwner.lifecycleOwner,
+        LocalSavedStateRegistryOwner provides platformContext.architectureComponentsOwner.savedStateRegistryOwner,
         LocalSaveableStateRegistry provides saveableStateRegistry,
         LocalHostDefaultProvider provides hostDefaultProvider,
         content = content,

compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/platform/DefaultNavigationEventDispatcherOwner.skiko.kt

@@ -18,22 +18,15 @@ package androidx.compose.ui.platform
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.InternalComposeApi
-import androidx.compose.runtime.staticCompositionLocalOf
-import androidx.compose.ui.backhandler.LocalCompatNavigationEventDispatcherOwner
 import androidx.navigationevent.NavigationEventDispatcherOwner
-
-/**
- * Internal helper to provide [NavigationEventDispatcherOwner] from Compose UI module.
- * In applications please use [androidx.navigationevent.compose.LocalNavigationEventDispatcherOwner].
- *
- * @hide
- */
-internal val LocalInternalNavigationEventDispatcherOwner =
-    staticCompositionLocalOf<NavigationEventDispatcherOwner?> { null }
+import androidx.navigationevent.compose.LocalNavigationEventDispatcherOwner
 
 
+@Deprecated(
+    "Moved to navigation-event-compose library in androidx.navigationevent.compose package.",
+    level = DeprecationLevel.HIDDEN
+)
 @InternalComposeApi
 @Composable
 fun findDefaultNavigationEventDispatcherOwner(): NavigationEventDispatcherOwner? =
-    LocalInternalNavigationEventDispatcherOwner.current
-        ?: LocalCompatNavigationEventDispatcherOwner.current
+    LocalNavigationEventDispatcherOwner.current