Update navArgument import (#722)

* Update navArgument import navArgument has been moved to base navigation so we need to change the import. * Update import in Navigation Material Updating the NamedNavArgument import now that it has been moved to the base navigation library. * Update imports in Nav Animation NavGraphBuilder Update the imports and API for NavGraphBuilder since NamedNavArguments have been moved. Co-authored-by: Jeremy Woods <jbwoods@google.com>
google · Sep 27, 2021 · 6611ebd · 6611ebd
1 parent 3d3a1b4
commit 6611ebd
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -13,7 +13,7 @@ okhttp = "3.12.13"
 coil = "1.3.0"
 
 androidxtest = "1.4.0"
-androidxnavigation = "2.4.0-alpha07"
+androidxnavigation = "2.4.0-alpha09"
 
 [libraries]
 compose-ui-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }

diff --git a/navigation-animation/api/current.api b/navigation-animation/api/current.api
@@ -16,7 +16,7 @@ package com.google.accompanist.navigation.animation {
   }
 
   public final class NavGraphBuilderKt {
-    method @androidx.compose.animation.ExperimentalAnimationApi public static void composable(androidx.navigation.NavGraphBuilder, String route, optional java.util.List<androidx.navigation.compose.NamedNavArgument> arguments, optional java.util.List<androidx.navigation.NavDeepLink> deepLinks, optional kotlin.jvm.functions.Function3<? super androidx.compose.animation.AnimatedContentScope<java.lang.String>,? super androidx.navigation.NavBackStackEntry,? super androidx.navigation.NavBackStackEntry,? extends androidx.compose.animation.EnterTransition>? enterTransition, optional kotlin.jvm.functions.Function3<? super androidx.compose.animation.AnimatedContentScope<java.lang.String>,? super androidx.navigation.NavBackStackEntry,? super androidx.navigation.NavBackStackEntry,? extends androidx.compose.animation.ExitTransition>? exitTransition, optional kotlin.jvm.functions.Function3<? super androidx.compose.animation.AnimatedContentScope<java.lang.String>,? super androidx.navigation.NavBackStackEntry,? super androidx.navigation.NavBackStackEntry,? extends androidx.compose.animation.EnterTransition>? popEnterTransition, optional kotlin.jvm.functions.Function3<? super androidx.compose.animation.AnimatedContentScope<java.lang.String>,? super androidx.navigation.NavBackStackEntry,? super androidx.navigation.NavBackStackEntry,? extends androidx.compose.animation.ExitTransition>? popExitTransition, kotlin.jvm.functions.Function2<? super androidx.compose.animation.AnimatedVisibilityScope,? super androidx.navigation.NavBackStackEntry,kotlin.Unit> content);
+    method @androidx.compose.animation.ExperimentalAnimationApi public static void composable(androidx.navigation.NavGraphBuilder, String route, optional java.util.List<androidx.navigation.NamedNavArgument> arguments, optional java.util.List<androidx.navigation.NavDeepLink> deepLinks, optional kotlin.jvm.functions.Function3<? super androidx.compose.animation.AnimatedContentScope<java.lang.String>,? super androidx.navigation.NavBackStackEntry,? super androidx.navigation.NavBackStackEntry,? extends androidx.compose.animation.EnterTransition>? enterTransition, optional kotlin.jvm.functions.Function3<? super androidx.compose.animation.AnimatedContentScope<java.lang.String>,? super androidx.navigation.NavBackStackEntry,? super androidx.navigation.NavBackStackEntry,? extends androidx.compose.animation.ExitTransition>? exitTransition, optional kotlin.jvm.functions.Function3<? super androidx.compose.animation.AnimatedContentScope<java.lang.String>,? super androidx.navigation.NavBackStackEntry,? super androidx.navigation.NavBackStackEntry,? extends androidx.compose.animation.EnterTransition>? popEnterTransition, optional kotlin.jvm.functions.Function3<? super androidx.compose.animation.AnimatedContentScope<java.lang.String>,? super androidx.navigation.NavBackStackEntry,? super androidx.navigation.NavBackStackEntry,? extends androidx.compose.animation.ExitTransition>? popExitTransition, kotlin.jvm.functions.Function2<? super androidx.compose.animation.AnimatedVisibilityScope,? super androidx.navigation.NavBackStackEntry,kotlin.Unit> content);
     method @androidx.compose.animation.ExperimentalAnimationApi public static void navigation(androidx.navigation.NavGraphBuilder, String startDestination, String route, optional kotlin.jvm.functions.Function3<? super androidx.compose.animation.AnimatedContentScope<java.lang.String>,? super androidx.navigation.NavBackStackEntry,? super androidx.navigation.NavBackStackEntry,? extends androidx.compose.animation.EnterTransition>? enterTransition, optional kotlin.jvm.functions.Function3<? super androidx.compose.animation.AnimatedContentScope<java.lang.String>,? super androidx.navigation.NavBackStackEntry,? super androidx.navigation.NavBackStackEntry,? extends androidx.compose.animation.ExitTransition>? exitTransition, optional kotlin.jvm.functions.Function3<? super androidx.compose.animation.AnimatedContentScope<java.lang.String>,? super androidx.navigation.NavBackStackEntry,? super androidx.navigation.NavBackStackEntry,? extends androidx.compose.animation.EnterTransition>? popEnterTransition, optional kotlin.jvm.functions.Function3<? super androidx.compose.animation.AnimatedContentScope<java.lang.String>,? super androidx.navigation.NavBackStackEntry,? super androidx.navigation.NavBackStackEntry,? extends androidx.compose.animation.ExitTransition>? popExitTransition, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
   }
 

diff --git a/...on-animation/src/main/java/com/google/accompanist/navigation/animation/NavGraphBuilder.kt b/...on-animation/src/main/java/com/google/accompanist/navigation/animation/NavGraphBuilder.kt
@@ -22,11 +22,11 @@ import androidx.compose.animation.EnterTransition
 import androidx.compose.animation.ExitTransition
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.runtime.Composable
+import androidx.navigation.NamedNavArgument
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavDeepLink
 import androidx.navigation.NavGraph
 import androidx.navigation.NavGraphBuilder
-import androidx.navigation.compose.NamedNavArgument
 import androidx.navigation.get
 import androidx.navigation.navigation
 

diff --git a/navigation-material/api/current.api b/navigation-material/api/current.api
@@ -38,7 +38,7 @@ package com.google.accompanist.navigation.material {
   }
 
   public final class NavGraphBuilderKt {
-    method @com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi public static void bottomSheet(androidx.navigation.NavGraphBuilder, String route, optional java.util.List<androidx.navigation.compose.NamedNavArgument> arguments, optional java.util.List<androidx.navigation.NavDeepLink> deepLinks, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.layout.ColumnScope,? super androidx.navigation.NavBackStackEntry,kotlin.Unit> content);
+    method @com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi public static void bottomSheet(androidx.navigation.NavGraphBuilder, String route, optional java.util.List<androidx.navigation.NamedNavArgument> arguments, optional java.util.List<androidx.navigation.NavDeepLink> deepLinks, kotlin.jvm.functions.Function2<? super androidx.compose.foundation.layout.ColumnScope,? super androidx.navigation.NavBackStackEntry,kotlin.Unit> content);
   }
 
   public final class SheetContentHostKt {

diff --git a/...al/src/androidTest/java/com/google/accompanist/navigation.material/NavGraphBuilderTest.kt b/...al/src/androidTest/java/com/google/accompanist/navigation.material/NavGraphBuilderTest.kt
@@ -25,8 +25,8 @@ import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.core.net.toUri
 import androidx.navigation.NavDeepLinkRequest
 import androidx.navigation.compose.NavHost
-import androidx.navigation.compose.navArgument
 import androidx.navigation.contains
+import androidx.navigation.navArgument
 import androidx.navigation.navDeepLink
 import androidx.navigation.navigation
 import androidx.navigation.plusAssign

diff --git a/...tion-material/src/main/java/com/google/accompanist/navigation/material/NavGraphBuilder.kt b/...tion-material/src/main/java/com/google/accompanist/navigation/material/NavGraphBuilder.kt
@@ -18,10 +18,10 @@ package com.google.accompanist.navigation.material
 
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.runtime.Composable
+import androidx.navigation.NamedNavArgument
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavDeepLink
 import androidx.navigation.NavGraphBuilder
-import androidx.navigation.compose.NamedNavArgument
 import androidx.navigation.get
 
 /**