tunjid · tunjid · Apr 27, 2025 · Apr 25, 2025 · Apr 25, 2025 · Apr 25, 2025
diff --git a/build-logic/wrapper/gradle-wrapper.properties b/build-logic/wrapper/gradle-wrapper.properties
@@ -15,7 +15,7 @@
 #
 #Mon Jul 05 07:23:39 EDT 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,33 +1,36 @@
 [versions]
-androidGradlePlugin = "8.5.2"
+androidGradlePlugin = "8.9.2"
 androidxActivity = "1.9.2"
-activity-compose = "1.10.0"
+activity-compose = "1.10.1"
 androidxAppCompat = "1.7.0"
-androidxBenchmark = "1.3.3"
-androidxCore = "1.15.0"
-androidxCollection = "1.5.0-beta03"
+androidxBenchmark = "1.3.4"
+androidxCore = "1.16.0"
+androidxCollection = "1.5.0"
 androidxCompose = "1.7.0"
 androidxPaging = "3.3.2"
+androidxSavedState = "1.3.0-alpha07"
 androidxTestCore = "1.6.1"
 androidxTestExt = "1.2.1"
 androidxTestRunner = "1.6.2"
 androidxTestRules = "1.6.1"
 dokka = "1.8.20"
-jetbrainsCompose = "1.8.0-alpha03"
-jetbrainsLifecycle = "2.8.4"
+jetbrainsCompose = "1.8.0-rc01"
+jetbrainsLifecycle = "2.9.0-alpha07"
 jetbrainsMaterial3Adaptive = "1.0.1"
 junit4 = "4.13.2"
-kotlin = "2.1.0"
-kotlinxCoroutines = "1.9.0"
-kotlinxDatetime = "0.6.1"
-lifecycle-runtime = "2.8.6"
+kotlin = "2.1.20"
+kotlinxCoroutines = "1.10.2"
+kotlinxDatetime = "0.6.2"
 tunjidStateHolder = "1.1.0"
-tunjidComposables = "0.0.14"
+tunjidComposables = "0.0.16"
 junit = "4.13.2"
 runner = "1.0.2"
 espressoCore = "3.0.2"
 appcompatV7 = "28.0.0"
 googleMaterial = "1.12.0"
+lifecycleViewmodelNavigation3 = "1.0.0-SNAPSHOT"
+navigation3 = "0.1.0-SNAPSHOT"
+materialIcons = "1.6.11"
 
 [libraries]
 android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }
@@ -44,6 +47,7 @@ androidx-compose-material-iconsExtended = { group = "androidx.compose.material",
 androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime" }
 androidx-compose-ui-ui = { group = "androidx.compose.ui", name = "ui" }
 androidx-compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
+androidx-compose-ui-platform = { group = "androidx.compose.ui", name = "ui-platform" }
 androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
 androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
 androidx-compose-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
@@ -53,26 +57,38 @@ androidx-compose-material3-adaptive = { group = "androidx.compose.material3.adap
 androidx-compose-material3-adaptive-layout = { group = "androidx.compose.material3.adaptive", name = "adaptive-layout" }
 androidx-compose-material3-adaptive-navigation = { group = "androidx.compose.material3.adaptive", name = "adaptive-navigation" }
 androidx-compose-material3-windowSizeClass = { group = "androidx.compose.material3", name = "material3-window-size-class" }
+androidx-savedstate-savedstate = { group = "androidx.compose.savedstate", name = "savedstate", version.ref = "androidxSavedState" }
+androidx-savedstate-compose = { group = "androidx.compose.savedstate", name = "savedstate-compose", version.ref = "androidxSavedState" }
 
 jetbrains-compose-animation = { group = "org.jetbrains.compose.animation", name = "animation", version.ref = "jetbrainsCompose" }
 jetbrains-compose-foundation = { group = "org.jetbrains.compose.foundation", name = "foundation", version.ref = "jetbrainsCompose" }
 jetbrains-compose-foundation-layout = { group = "org.jetbrains.compose.foundation", name = "foundation-layout", version.ref = "jetbrainsCompose" }
 jetbrains-compose-gradlePlugin = { group = "org.jetbrains.compose", name = "compose-gradle-plugin", version.ref = "jetbrainsCompose" }
 jetbrains-compose-runtime = { group = "org.jetbrains.compose.runtime", name = "runtime", version.ref = "jetbrainsCompose" }
+jetbrains-compose-ui-backhandler = { group = "org.jetbrains.compose.ui", name = "ui-backhandler", version.ref = "jetbrainsCompose" }
+jetbrains-compose-ui-platform = { group = "org.jetbrains.compose.ui", name = "ui-platform", version.ref = "jetbrainsCompose" }
 jetbrains-compose-ui-test = { group = "org.jetbrains.compose.ui", name = "ui-test-junit4", version.ref = "jetbrainsCompose" }
 jetbrains-compose-ui-testManifest = { group = "org.jetbrains.compose.ui", name = "ui-test-manifest", version.ref = "jetbrainsCompose" }
 #jetbrains-compose-ui-tooling = { group = "org.jetbrains.compose.ui", name = "ui-tooling", version.ref = "jetbrainsCompose" }
 jetbrains-compose-ui-tooling = { group = "org.jetbrains.compose.ui", name = "ui-tooling-preview-desktop", version.ref = "jetbrainsCompose" }
 jetbrains-compose-ui-ui = { group = "org.jetbrains.compose.ui", name = "ui", version.ref = "jetbrainsCompose" }
 jetbrains-compose-ui-util = { group = "org.jetbrains.compose.ui", name = "ui-util", version.ref = "jetbrainsCompose" }
 jetbrains-compose-material3 = { group = "org.jetbrains.compose.material3", name = "material3", version.ref = "jetbrainsCompose" }
+jetbrains-compose-material-icons-core = { group = "org.jetbrains.compose.material", name = "material-icons-core", version.ref = "materialIcons" }
+jetbrains-compose-material-icons-extended = { group = "org.jetbrains.compose.material", name = "material-icons-extended", version.ref = "materialIcons" }
 jetbrains-compose-material3-adaptive-navigation-suite = { group = "org.jetbrains.compose.material3", name = "material3-adaptive-navigation-suite", version.ref = "jetbrainsCompose" }
 jetbrains-compose-material3-adaptive = { group = "org.jetbrains.compose.material3.adaptive", name = "adaptive", version.ref = "jetbrainsMaterial3Adaptive" }
 jetbrains-compose-material3-adaptive-layout = { group = "org.jetbrains.compose.material3.adaptive", name = "adaptive-layout", version.ref = "jetbrainsMaterial3Adaptive" }
 jetbrains-lifecycle-runtime = { group = "org.jetbrains.androidx.lifecycle", name = "lifecycle-runtime", version.ref = "jetbrainsLifecycle" }
 jetbrains-lifecycle-runtime-compose = { group = "org.jetbrains.androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "jetbrainsLifecycle" }
 jetbrains-lifecycle-viewmodel = { group = "org.jetbrains.androidx.lifecycle", name = "lifecycle-viewmodel", version.ref = "jetbrainsLifecycle" }
 jetbrains-lifecycle-viewmodel-compose = { group = "org.jetbrains.androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "jetbrainsLifecycle" }
+jetbrains-lifecycle-viewmodel-savedstate = { group = "org.jetbrains.androidx.lifecycle", name = "lifecycle-viewmodel-savedstate", version.ref = "jetbrainsLifecycle" }
+jetbrains-savedstate-savedstate = { group = "org.jetbrains.androidx.savedstate", name = "savedstate", version.ref = "androidxSavedState" }
+jetbrains-savedstate-compose = { group = "org.jetbrains.androidx.savedstate", name = "savedstate-compose", version.ref = "androidxSavedState" }
+
+androidx-navigation3 = { module = "androidx.navigation3:navigation3", version.ref = "navigation3" }
+androidx-viewmodel-navigation3 = { module = "androidx.lifecycle:lifecycle-viewmodel-navigation3", version.ref = "lifecycleViewmodelNavigation3" }
 
 kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }
 kotlinx-coroutines-swing = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-swing", version.ref = "kotlinxCoroutines" }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -15,7 +15,7 @@
 #
 #Mon Jul 05 07:23:39 EDT 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/library/compose/build.gradle.kts b/library/compose/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     kotlin("multiplatform")
     id("publishing-library-convention")
+    id("android-library-convention")
     id("kotlin-jvm-convention")
     id("maven-publish")
     signing
@@ -11,8 +12,8 @@ plugins {
 
 kotlin {
     applyDefaultHierarchyTemplate()
+    androidTarget()
     jvm {
-        withJava()
         testRuns["test"].executionTask.configure {
             useJUnit()
         }
@@ -43,8 +44,19 @@ kotlin {
                 implementation(libs.jetbrains.lifecycle.runtime.compose)
                 implementation(libs.jetbrains.lifecycle.viewmodel)
                 implementation(libs.jetbrains.lifecycle.viewmodel.compose)
+
+
+                implementation(libs.androidx.navigation3)
+                implementation(libs.jetbrains.savedstate.compose)
+
             }
         }
+        androidMain {
+            dependencies {
+                implementation(libs.androidx.viewmodel.navigation3)
+            }
+        }
+
         commonTest {
             dependencies {
                 implementation(kotlin("test"))

diff --git a/...dMain/kotlin/com/tunjid/treenav/compose/DecoratedNavEntryMultiPaneDisplayScope.android.kt b/...dMain/kotlin/com/tunjid/treenav/compose/DecoratedNavEntryMultiPaneDisplayScope.android.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * 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 com.tunjid.treenav.compose
+
+import androidx.compose.runtime.Stable
+import androidx.lifecycle.viewmodel.navigation3.ViewModelStoreNavEntryDecorator
+
+@Stable
+internal actual val PlatformViewModelStoreNavEntryDecorator: Any?
+    get() = ViewModelStoreNavEntryDecorator