Temporary downgrade navitation to 2.7.*

gradle.properties

@@ -113,7 +113,7 @@ artifactRedirecting.androidx.annotation.version=1.8.0-alpha02
 artifactRedirecting.androidx.annotation.targetVersions=jvm=1.7.1,default=1.8.0-alpha02
 # Lifecycle group and modules versions are set according to https://youtrack.jetbrains.com/issue/COMPOSE-1306
 artifactRedirecting.androidx.lifecycle.version=2.8.0-beta01
-artifactRedirecting.androidx.navigation.version=2.8.0-alpha05
+artifactRedirecting.androidx.navigation.version=2.7.7
 artifactRedirecting.androidx.savedstate.version=1.2.1
 
 # For the purpose of substituteForRedirectedPublishedDependencies (look for it in the code)

libraryversions.toml

@@ -98,7 +98,7 @@ MEDIA = "1.7.0-rc01"
 MEDIA2 = "1.3.0-alpha01"
 MEDIAROUTER = "1.7.0-alpha01"
 METRICS = "1.0.0-alpha05"
-NAVIGATION = "2.8.0-alpha05"
+NAVIGATION = "2.7.7"
 PAGING = "3.3.0-alpha03"
 PALETTE = "1.1.0-alpha01"
 PERCENTLAYOUT = "1.1.0-alpha01"

navigation/navigation-common/api/current.txt

@@ -116,7 +116,7 @@ package androidx.navigation {
     method public androidx.navigation.NavDestination getDestination();
     method public String getId();
     method public androidx.lifecycle.Lifecycle getLifecycle();
-    method @MainThread public androidx.lifecycle.SavedStateHandle getSavedStateHandle();
+    method public androidx.lifecycle.SavedStateHandle getSavedStateHandle();
     method public androidx.savedstate.SavedStateRegistry getSavedStateRegistry();
     method public androidx.lifecycle.ViewModelStore getViewModelStore();
     property public final android.os.Bundle? arguments;
@@ -125,7 +125,7 @@ package androidx.navigation {
     property public final androidx.navigation.NavDestination destination;
     property public final String id;
     property public androidx.lifecycle.Lifecycle lifecycle;
-    property @MainThread public final androidx.lifecycle.SavedStateHandle savedStateHandle;
+    property public final androidx.lifecycle.SavedStateHandle savedStateHandle;
     property public androidx.savedstate.SavedStateRegistry savedStateRegistry;
     property public androidx.lifecycle.ViewModelStore viewModelStore;
     field public static final androidx.navigation.NavBackStackEntry.Companion Companion;
@@ -406,7 +406,6 @@ package androidx.navigation {
     method public T parseValue(String value, T previousValue);
     method public abstract void put(android.os.Bundle bundle, String key, T value);
     method public String serializeAsValue(T value);
-    method public boolean valueEquals(T value, T other);
     property public boolean isNullableAllowed;
     property public String name;
     field public static final androidx.navigation.NavType<boolean[]?> BoolArrayType;
@@ -432,12 +431,11 @@ package androidx.navigation {
     property public String name;
   }
 
-  public static final class NavType.ParcelableArrayType<D extends android.os.Parcelable> extends androidx.navigation.NavType<D[]> {
+  public static final class NavType.ParcelableArrayType<D extends android.os.Parcelable> extends androidx.navigation.NavType<D[]?> {
     ctor public NavType.ParcelableArrayType(Class<D> type);
     method public D[]? get(android.os.Bundle bundle, String key);
     method public D[] parseValue(String value);
     method public void put(android.os.Bundle bundle, String key, D[]? value);
-    method public boolean valueEquals(D[]? value, D[]? other);
     property public String name;
   }
 
@@ -449,12 +447,11 @@ package androidx.navigation {
     property public String name;
   }
 
-  public static final class NavType.SerializableArrayType<D extends java.io.Serializable> extends androidx.navigation.NavType<D[]> {
+  public static final class NavType.SerializableArrayType<D extends java.io.Serializable> extends androidx.navigation.NavType<D[]?> {
     ctor public NavType.SerializableArrayType(Class<D> type);
     method public D[]? get(android.os.Bundle bundle, String key);
     method public D[] parseValue(String value);
     method public void put(android.os.Bundle bundle, String key, D[]? value);
-    method public boolean valueEquals(D[]? value, D[]? other);
     property public String name;
   }
 

navigation/navigation-common/api/desktop/navigation-common.api

@@ -273,7 +273,6 @@ public abstract class androidx/navigation/NavType {
 	public abstract fun put (Landroidx/core/bundle/Bundle;Ljava/lang/String;Ljava/lang/Object;)V
 	public fun serializeAsValue (Ljava/lang/Object;)Ljava/lang/String;
 	public fun toString ()Ljava/lang/String;
-	public fun valueEquals (Ljava/lang/Object;Ljava/lang/Object;)Z
 }
 
 public final class androidx/navigation/NavType$Companion {

navigation/navigation-common/api/restricted_current.txt

@@ -116,7 +116,7 @@ package androidx.navigation {
     method public androidx.navigation.NavDestination getDestination();
     method public String getId();
     method public androidx.lifecycle.Lifecycle getLifecycle();
-    method @MainThread public androidx.lifecycle.SavedStateHandle getSavedStateHandle();
+    method public androidx.lifecycle.SavedStateHandle getSavedStateHandle();
     method public androidx.savedstate.SavedStateRegistry getSavedStateRegistry();
     method public androidx.lifecycle.ViewModelStore getViewModelStore();
     property public final android.os.Bundle? arguments;
@@ -125,7 +125,7 @@ package androidx.navigation {
     property public final androidx.navigation.NavDestination destination;
     property public final String id;
     property public androidx.lifecycle.Lifecycle lifecycle;
-    property @MainThread public final androidx.lifecycle.SavedStateHandle savedStateHandle;
+    property public final androidx.lifecycle.SavedStateHandle savedStateHandle;
     property public androidx.savedstate.SavedStateRegistry savedStateRegistry;
     property public androidx.lifecycle.ViewModelStore viewModelStore;
     field public static final androidx.navigation.NavBackStackEntry.Companion Companion;
@@ -406,7 +406,6 @@ package androidx.navigation {
     method public T parseValue(String value, T previousValue);
     method public abstract void put(android.os.Bundle bundle, String key, T value);
     method public String serializeAsValue(T value);
-    method public boolean valueEquals(T value, T other);
     property public boolean isNullableAllowed;
     property public String name;
     field public static final androidx.navigation.NavType<boolean[]?> BoolArrayType;
@@ -432,12 +431,11 @@ package androidx.navigation {
     property public String name;
   }
 
-  public static final class NavType.ParcelableArrayType<D extends android.os.Parcelable> extends androidx.navigation.NavType<D[]> {
+  public static final class NavType.ParcelableArrayType<D extends android.os.Parcelable> extends androidx.navigation.NavType<D[]?> {
     ctor public NavType.ParcelableArrayType(Class<D> type);
     method public D[]? get(android.os.Bundle bundle, String key);
     method public D[] parseValue(String value);
     method public void put(android.os.Bundle bundle, String key, D[]? value);
-    method public boolean valueEquals(D[]? value, D[]? other);
     property public String name;
   }
 
@@ -449,12 +447,11 @@ package androidx.navigation {
     property public String name;
   }
 
-  public static final class NavType.SerializableArrayType<D extends java.io.Serializable> extends androidx.navigation.NavType<D[]> {
+  public static final class NavType.SerializableArrayType<D extends java.io.Serializable> extends androidx.navigation.NavType<D[]?> {
     ctor public NavType.SerializableArrayType(Class<D> type);
     method public D[]? get(android.os.Bundle bundle, String key);
     method public D[] parseValue(String value);
     method public void put(android.os.Bundle bundle, String key, D[]? value);
-    method public boolean valueEquals(D[]? value, D[]? other);
     property public String name;
   }
 

navigation/navigation-common/build.gradle

@@ -33,7 +33,6 @@ import org.jetbrains.kotlin.konan.target.Family
 plugins {
     id("AndroidXPlugin")
     id("com.android.library")
-    alias(libs.plugins.kotlinSerialization)
     id("JetbrainsAndroidXPlugin")
 }
 
@@ -81,7 +80,6 @@ kotlin {
                 api project(":savedstate:savedstate")
 
                 api(libs.kotlinStdlib)
-                implementation(libs.kotlinSerializationCore)
             }
         }
 

navigation/navigation-common/src/androidInstrumentedTest/kotlin/androidx/navigation/NavArgumentTest.kt

@@ -64,15 +64,4 @@ class NavArgumentTest {
         assertThat(intArrArgument.verify("intArrayArg", bundle)).isTrue()
         assertThat(intArrNonNullArgument.verify("intArrayArg", bundle)).isFalse()
     }
-
-    @Test
-    fun setDefaultValuePresent() {
-        val argument = NavArgument.Builder()
-            .setType(NavType.IntType)
-            .setIsNullable(false)
-            .setUnknownDefaultValuePresent(true)
-            .build()
-
-        assertThat(argument.isDefaultValuePresent).isTrue()
-    }
 }

navigation/navigation-common/src/androidInstrumentedTest/kotlin/androidx/navigation/NavDeepLinkTest.kt

@@ -380,7 +380,7 @@ class NavDeepLinkTest {
 
     // Ensure case when matching the exact argument query (i.e. param names in braces) is handled
     @Test
-    fun deepLinkQueryParamNullableStringArgumentMatchParamsInBraces() {
+    fun deepLinkQueryParamNullableArgumentMatchParamsInBraces() {
         val deepLinkArgument = "$DEEP_LINK_EXACT_HTTPS/users?myarg={myarg}"
         val deepLink = NavDeepLink(deepLinkArgument)
 
@@ -391,30 +391,6 @@ class NavDeepLinkTest {
         assertWithMessage("Args should not be null")
             .that(matchArgs)
             .isNotNull()
-        // We allow {argName} values for String types
-        assertWithMessage("Args should contain the argument")
-            .that(matchArgs?.getString("myarg"))
-            .isEqualTo("{myarg}")
-    }
-
-    // Ensure case when matching the exact argument query (i.e. param names in braces) is handled
-    @Test
-    fun deepLinkQueryParamNullableNonStringArgumentMatchParamsInBraces() {
-        val deepLinkArgument = "$DEEP_LINK_EXACT_HTTPS/users?myarg={myarg}"
-        val deepLink = NavDeepLink(deepLinkArgument)
-        val intArrayArg = NavArgument.Builder().setType(NavType.IntArrayType)
-            .setIsNullable(true)
-            .setDefaultValue(null)
-            .build()
-
-        val matchArgs = deepLink.getMatchingArguments(
-            Uri.parse(deepLinkArgument),
-            mapOf("myarg" to intArrayArg)
-        )
-        assertWithMessage("Args should not be null")
-            .that(matchArgs)
-            .isNotNull()
-        // For non-strings, {argName} values are invalid and considered lack of argument value
         assertWithMessage("Args should not contain the argument")
             .that(matchArgs?.containsKey("myarg"))
             .isFalse()
@@ -436,7 +412,7 @@ class NavDeepLinkTest {
         assertWithMessage("Args should not be null")
             .that(matchArgs)
             .isNotNull()
-        assertWithMessage("Args should contain the argument and it should not be null")
+        assertWithMessage("Args should contain the argument and it should be null")
             .that(matchArgs?.getString("myarg"))
             .isEqualTo("myarg")
     }
@@ -472,14 +448,15 @@ class NavDeepLinkTest {
         val deepLink = NavDeepLink(deepLinkArgument)
 
         val id = 2
+        val optional = "test"
         val matchArgs = deepLink.getMatchingArguments(
             Uri.parse(
                 "$DEEP_LINK_EXACT_HTTPS/users?optional={optional}&id={id}"
                     .replace("{id}", id.toString())
             ),
             mapOf(
                 "id" to intArgument(),
-                "optional" to stringArrayArgument(arrayOf("theArg"))
+                "optional" to stringArgument(optional)
             )
         )
         assertWithMessage("Args should not be null")
@@ -488,9 +465,9 @@ class NavDeepLinkTest {
         assertWithMessage("Args should contain the id")
             .that(matchArgs?.getInt("id"))
             .isEqualTo(id)
-        assertWithMessage("Args should not contain optional")
-            .that(matchArgs?.getStringArray("optional"))
-            .isEqualTo(arrayOf("{optional}"))
+        assertWithMessage("Args should contain optional")
+            .that(matchArgs?.containsKey("optional"))
+            .isFalse()
     }
 
     @Test
@@ -883,9 +860,9 @@ class NavDeepLinkTest {
         assertWithMessage("Args should not be null")
             .that(matchArgs)
             .isNotNull()
-        assertWithMessage("Args should contain the argument")
-            .that(matchArgs?.getString("myarg"))
-            .isEqualTo("{myarg}")
+        assertWithMessage("Args should not contain the argument")
+            .that(matchArgs?.containsKey("myarg"))
+            .isFalse()
     }
 
     // Handle the case were the input is wild card and separator with no argument
@@ -1263,15 +1240,14 @@ class NavDeepLinkTest {
 
         val matchArgs = deepLink.getMatchingArguments(
             Uri.parse(deepLinkString),
-            mapOf("myarg" to stringArrayArgument(arrayOf("theArg")))
+            mapOf("myarg" to nullableStringArgument())
         )
         assertWithMessage("Args should not be null")
             .that(matchArgs)
             .isNotNull()
-        // We allow {argName} values for String types
-        assertWithMessage("Args bundle should contain arg value")
-            .that(matchArgs?.getStringArray("myarg"))
-            .isEqualTo(arrayOf("{myarg}"))
+        assertWithMessage("Args bundle should be empty")
+            .that(matchArgs?.isEmpty)
+            .isTrue()
     }
 
     @Test

navigation/navigation-common/src/androidInstrumentedTest/kotlin/androidx/navigation/NavDestinationBuilderTest.kt

@@ -140,25 +140,6 @@ class NavDestinationTest {
             }
         }
     }
-
-    @Test
-    fun navDestinationDefaultValuePresent() {
-        val destination = provider.navDestination(DESTINATION_ID) {
-            argument("arg1") {
-                type = NavType.StringType
-                unknownDefaultValuePresent = true
-            }
-            argument("arg2") {
-                type = NavType.StringType
-                unknownDefaultValuePresent = false
-            }
-        }
-        val arg1 = destination.arguments["arg1"]
-        assertThat(arg1?.isDefaultValuePresent).isTrue()
-
-        val arg2 = destination.arguments["arg2"]
-        assertThat(arg2?.isDefaultValuePresent).isFalse()
-    }
 }
 
 private const val DESTINATION_ID = 1

navigation/navigation-common/src/androidInstrumentedTest/kotlin/androidx/navigation/NavTypeTest.kt

@@ -20,8 +20,6 @@ import android.content.pm.ActivityInfo
 import android.graphics.Bitmap
 import android.net.Uri
 import android.os.Bundle
-import android.os.Parcel
-import android.os.Parcelable
 import androidx.navigation.common.test.R
 import androidx.test.filters.SmallTest
 import com.google.common.truth.Truth.assertThat
@@ -257,45 +255,6 @@ class NavTypeTest {
             .isEqualTo(en)
     }
 
-    @Test
-    fun parcelableArrayValueEquals() {
-        val type = NavType.ParcelableArrayType(TestParcelable::class.java)
-        val array1 = arrayOf(TestParcelable(1), TestParcelable(2))
-        val array2 = arrayOf(TestParcelable(1), TestParcelable(2))
-        assertThat(type.valueEquals(array1, array2)).isTrue()
-
-        // deep comparison, order matters
-        val array3 = arrayOf(TestParcelable(2), TestParcelable(1))
-        val array4 = arrayOf(TestParcelable(1), TestParcelable(2))
-        assertThat(type.valueEquals(array3, array4)).isFalse()
-    }
-
-    @Test
-    fun serializableArrayValueEquals() {
-        val type = NavType.SerializableArrayType(TestSerializable::class.java)
-        val array1 = arrayOf(TestSerializable(1), TestSerializable(2))
-        val array2 = arrayOf(TestSerializable(1), TestSerializable(2))
-        assertThat(type.valueEquals(array1, array2)).isTrue()
-
-        // deep comparison, order matters
-        val array3 = arrayOf(TestSerializable(2), TestSerializable(1))
-        val array4 = arrayOf(TestSerializable(1), TestSerializable(2))
-        assertThat(type.valueEquals(array3, array4)).isFalse()
-    }
-
-    @Test
-    fun primitiveArrayValueEquals() {
-        val type = NavType.IntArrayType
-        val array1 = intArrayOf(1, 2)
-        val array2 = intArrayOf(1, 2)
-        assertThat(type.valueEquals(array1, array2)).isTrue()
-
-        // deep comparison, order matters
-        val array3 = intArrayOf(2, 1)
-        val array4 = intArrayOf(1, 2)
-        assertThat(type.valueEquals(array3, array4)).isFalse()
-    }
-
     @Test
     fun customType_defaultSerializeAsValue() {
         val testItemType = object : NavType<TestItem> (false) {
@@ -379,10 +338,3 @@ private class TestItem {
         return "TestItem"
     }
 }
-
-private data class TestParcelable(val arg: Int) : Parcelable {
-    override fun describeContents(): Int = 0
-    override fun writeToParcel(dest: Parcel, flags: Int) {}
-}
-
-private data class TestSerializable(val arg: Int) : Serializable

navigation/navigation-common/src/androidMain/kotlin/androidx/navigation/NavBackStackEntry.android.kt

@@ -18,7 +18,6 @@ package androidx.navigation
 import android.app.Application
 import android.content.Context
 import android.os.Bundle
-import androidx.annotation.MainThread
 import androidx.annotation.RestrictTo
 import androidx.lifecycle.AbstractSavedStateViewModelFactory
 import androidx.lifecycle.DEFAULT_ARGS_KEY
@@ -49,9 +48,7 @@ import java.util.UUID
  * destination is popped off the back stack, the lifecycle will be destroyed, state
  * will no longer be saved, and ViewModels will be cleared.
  */
-public actual class NavBackStackEntry
-@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-private constructor(
+public actual class NavBackStackEntry private constructor(
     private val context: Context?,
     /**
      * The destination associated with this entry
@@ -128,7 +125,6 @@ private constructor(
     /**
      * The [SavedStateHandle] for this entry.
      */
-    @get:MainThread
     public actual val savedStateHandle: SavedStateHandle by lazy {
         check(savedStateRegistryAttached) {
             "You cannot access the NavBackStackEntry's SavedStateHandle until it is added to " +