Revert "Move `LocalViewModelStoreOwner` to common on `viewmodel-..."
Revert submission 3007635-vm-compose-kmp
Reason for revert: broke the build
https://android-build.corp.google.com/artifact/submitted/11602986/androidx/latest/view/logs%2Fbuild_error.log
Reverted changes: /q/submissionid:3007635-vm-compose-kmp
Change-Id: Ib136a0f210d2871641b454b373ab56169c42ed1e
diff --git a/lifecycle/lifecycle-viewmodel-compose/src/androidMain/kotlin/androidx/lifecycle/viewmodel/compose/LocalViewModelStoreOwner.android.kt b/lifecycle/lifecycle-viewmodel-compose/src/androidMain/kotlin/androidx/lifecycle/viewmodel/compose/LocalViewModelStoreOwner.android.kt
index 6a2bd86..a0d4c81 100644
--- a/lifecycle/lifecycle-viewmodel-compose/src/androidMain/kotlin/androidx/lifecycle/viewmodel/compose/LocalViewModelStoreOwner.android.kt
+++ b/lifecycle/lifecycle-viewmodel-compose/src/androidMain/kotlin/androidx/lifecycle/viewmodel/compose/LocalViewModelStoreOwner.android.kt
@@ -17,10 +17,36 @@
package androidx.lifecycle.viewmodel.compose
import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.ProvidedValue
+import androidx.compose.runtime.compositionLocalOf
import androidx.compose.ui.platform.LocalView
import androidx.lifecycle.ViewModelStoreOwner
import androidx.lifecycle.findViewTreeViewModelStoreOwner
-@Composable
-internal actual fun findViewTreeViewModelStoreOwner(): ViewModelStoreOwner? =
- LocalView.current.findViewTreeViewModelStoreOwner()
+/**
+ * The CompositionLocal containing the current [ViewModelStoreOwner].
+ */
+public object LocalViewModelStoreOwner {
+ private val LocalViewModelStoreOwner =
+ compositionLocalOf<ViewModelStoreOwner?> { null }
+
+ /**
+ * Returns current composition local value for the owner or `null` if one has not
+ * been provided nor is one available via [findViewTreeViewModelStoreOwner] on the
+ * current [LocalView].
+ */
+ public val current: ViewModelStoreOwner?
+ @Composable
+ get() = LocalViewModelStoreOwner.current
+ ?: LocalView.current.findViewTreeViewModelStoreOwner()
+
+ /**
+ * Associates a [LocalViewModelStoreOwner] key to a value in a call to
+ * [CompositionLocalProvider].
+ */
+ public infix fun provides(viewModelStoreOwner: ViewModelStoreOwner):
+ ProvidedValue<ViewModelStoreOwner?> {
+ return LocalViewModelStoreOwner.provides(viewModelStoreOwner)
+ }
+}
diff --git a/lifecycle/lifecycle-viewmodel-compose/src/commonMain/kotlin/androidx/lifecycle/viewmodel/compose/LocalViewModelStoreOwner.kt b/lifecycle/lifecycle-viewmodel-compose/src/commonMain/kotlin/androidx/lifecycle/viewmodel/compose/LocalViewModelStoreOwner.kt
deleted file mode 100644
index 5a7d3bc..0000000
--- a/lifecycle/lifecycle-viewmodel-compose/src/commonMain/kotlin/androidx/lifecycle/viewmodel/compose/LocalViewModelStoreOwner.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2024 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.lifecycle.viewmodel.compose
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.ProvidedValue
-import androidx.compose.runtime.compositionLocalOf
-import androidx.lifecycle.ViewModelStoreOwner
-
-/**
- * The CompositionLocal containing the current [ViewModelStoreOwner].
- */
-public object LocalViewModelStoreOwner {
- private val LocalViewModelStoreOwner =
- compositionLocalOf<ViewModelStoreOwner?> { null }
-
- /**
- * Returns current composition local value for the owner or `null` if one has not
- * been provided nor is one available via [findViewTreeViewModelStoreOwner] on the
- * current [androidx.compose.ui.platform.LocalView].
- */
- public val current: ViewModelStoreOwner?
- @Composable
- get() = LocalViewModelStoreOwner.current ?: findViewTreeViewModelStoreOwner()
-
- /**
- * Associates a [LocalViewModelStoreOwner] key to a value in a call to
- * [CompositionLocalProvider].
- */
- public infix fun provides(viewModelStoreOwner: ViewModelStoreOwner):
- ProvidedValue<ViewModelStoreOwner?> {
- return LocalViewModelStoreOwner.provides(viewModelStoreOwner)
- }
-}
-
-@Composable
-internal expect fun findViewTreeViewModelStoreOwner(): ViewModelStoreOwner?
diff --git a/lifecycle/lifecycle-viewmodel-compose/src/desktopMain/kotlin/androidx/lifecycle/viewmodel/compose/LocalViewModelStoreOwner.desktop.kt b/lifecycle/lifecycle-viewmodel-compose/src/desktopMain/kotlin/androidx/lifecycle/viewmodel/compose/LocalViewModelStoreOwner.desktop.kt
deleted file mode 100644
index c9a5b7e..0000000
--- a/lifecycle/lifecycle-viewmodel-compose/src/desktopMain/kotlin/androidx/lifecycle/viewmodel/compose/LocalViewModelStoreOwner.desktop.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2024 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.lifecycle.viewmodel.compose
-
-import androidx.compose.runtime.Composable
-import androidx.lifecycle.ViewModelStoreOwner
-
-@Composable
-internal actual fun findViewTreeViewModelStoreOwner(): ViewModelStoreOwner? = null
