[1.325.*] Pre-release merge (#846)

android/build.gradle.kts

@@ -60,6 +60,17 @@ composeCompiler {
   )
 }
 
+// TODO: Remove when Nav3 gets a new release
+configurations.configureEach {
+  resolutionStrategy {
+    eachDependency {
+      if (requested.group == "androidx.lifecycle") {
+        useVersion(libs.versions.lifecycle.get())
+      }
+    }
+  }
+}
+
 licensee {
   allow("Apache-2.0")
   allow("MIT")

android/src/main/AndroidManifest.xml

@@ -23,7 +23,7 @@
       tools:targetApi="29" />
     <activity
       android:name=".MainActivity"
-      android:configChanges="colorMode|density|fontScale|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode"
+      android:configChanges="assetsPaths|colorMode|density|fontScale|fontWeightAdjustment|grammaticalGender|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|resourcesUnused|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode"
       android:launchMode="singleTask"
       android:taskAffinity=""
       android:exported="true">

gradle/libs.versions.toml

@@ -15,8 +15,9 @@ konvert = "4.1.0"
 kotlin = "2.1.21"
 kotlinResult = "2.0.1"
 leakcanary = "3.0-alpha-8"
-lifecycle = "2.9.0"
-navigation3 = "1.0.0-alpha02"
+lifecycle = "2.10.0-SNAPSHOT"
+# TODO: Update lifecycle to stable when next update drops
+navigation3 = "1.0.0-SNAPSHOT"
 navigation3-material = "1.0.0-SNAPSHOT"
 retrofit = "3.0.0"
 richtext = "1.0.0-alpha02"

settings.gradle.kts

@@ -102,10 +102,16 @@ dependencyResolutionManagement {
       name = "Compose Compiler Snapshots"
       content { includeGroup("androidx.compose.compiler") }
     }
-    maven("https://androidx.dev/snapshots/builds/13546692/artifacts/repository") {
+    maven("https://androidx.dev/snapshots/builds/13585391/artifacts/repository") {
       name = "AndroidX Snapshots"
-      mavenContent { snapshotsOnly() }
-      content { includeGroup("androidx.compose.material3.adaptive") }
+      content {
+        includeGroup("androidx.activity")
+        includeGroup("androidx.compose.material3.adaptive")
+        includeGroup("androidx.lifecycle")
+        includeGroup("androidx.navigationevent")
+        includeGroup("androidx.navigation3")
+        includeGroup("androidx.savedstate")
+      }
     }
     maven("https://oss.sonatype.org/content/repositories/snapshots/") {
       name = "Sonatype Snapshots"