Merge nav-runtime-ktx into nav-runtime

RelNote: "Navigation extention functions are now part of the main navigaiton library" Bug: 184292145 Test: ./gradlew checkApi Change-Id: I58879edf69670e69a337393f7e3d5dfe12c14acd
ggfan · Apr 5, 2021 · 96b48e3 · 96b48e3
1 parent 69c7fbc
commit 96b48e3
Show file tree

Hide file tree

Showing 25 changed files with 186 additions and 250 deletions.
diff --git a/navigation/navigation-runtime-ktx/api/api_lint.ignore b/navigation/navigation-runtime-ktx/api/api_lint.ignore
diff --git a/navigation/navigation-runtime-ktx/api/current.ignore b/navigation/navigation-runtime-ktx/api/current.ignore
@@ -1,5 +1,3 @@
 // Baseline format: 1.0
-RemovedClass: androidx.navigation.NavControllerKt:
-    Removed class androidx.navigation.NavControllerKt
-RemovedClass: androidx.navigation.NavHostKt:
-    Removed class androidx.navigation.NavHostKt
+RemovedPackage: androidx.navigation:
+    Removed package androidx.navigation
diff --git a/navigation/navigation-runtime-ktx/api/current.txt b/navigation/navigation-runtime-ktx/api/current.txt
@@ -1,45 +1 @@
 // Signature format: 4.0
-package androidx.navigation {
-
-  public final class ActivityKt {
-    method public static androidx.navigation.NavController findNavController(android.app.Activity, @IdRes int viewId);
-  }
-
-  public final class ActivityNavArgsLazyKt {
-    method @MainThread public static inline <reified Args extends androidx.navigation.NavArgs> androidx.navigation.NavArgsLazy<Args>! navArgs(android.app.Activity);
-  }
-
-  @androidx.navigation.NavDestinationDsl public final class ActivityNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.ActivityNavigator.Destination> {
-    ctor public ActivityNavigatorDestinationBuilder(androidx.navigation.ActivityNavigator navigator, @IdRes int id);
-    method public androidx.navigation.ActivityNavigator.Destination build();
-    method public String? getAction();
-    method public kotlin.reflect.KClass<? extends android.app.Activity>? getActivityClass();
-    method public android.net.Uri? getData();
-    method public String? getDataPattern();
-    method public String? getTargetPackage();
-    method public void setAction(String? p);
-    method public void setActivityClass(kotlin.reflect.KClass<? extends android.app.Activity>? p);
-    method public void setData(android.net.Uri? p);
-    method public void setDataPattern(String? p);
-    method public void setTargetPackage(String? p);
-    property public final String? action;
-    property public final kotlin.reflect.KClass<? extends android.app.Activity>? activityClass;
-    property public final android.net.Uri? data;
-    property public final String? dataPattern;
-    property public final String? targetPackage;
-  }
-
-  public final class ActivityNavigatorDestinationBuilderKt {
-    method public static inline void activity(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.ActivityNavigatorDestinationBuilder,kotlin.Unit> builder);
-  }
-
-  public final class ActivityNavigatorExtrasKt {
-    method public static androidx.navigation.ActivityNavigator.Extras ActivityNavigatorExtras(optional androidx.core.app.ActivityOptionsCompat? activityOptions, optional int flags);
-  }
-
-  public final class ViewKt {
-    method public static androidx.navigation.NavController findNavController(android.view.View);
-  }
-
-}
-
diff --git a/navigation/navigation-runtime-ktx/api/public_plus_experimental_current.txt b/navigation/navigation-runtime-ktx/api/public_plus_experimental_current.txt
@@ -1,45 +1 @@
 // Signature format: 4.0
-package androidx.navigation {
-
-  public final class ActivityKt {
-    method public static androidx.navigation.NavController findNavController(android.app.Activity, @IdRes int viewId);
-  }
-
-  public final class ActivityNavArgsLazyKt {
-    method @MainThread public static inline <reified Args extends androidx.navigation.NavArgs> androidx.navigation.NavArgsLazy<Args>! navArgs(android.app.Activity);
-  }
-
-  @androidx.navigation.NavDestinationDsl public final class ActivityNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.ActivityNavigator.Destination> {
-    ctor public ActivityNavigatorDestinationBuilder(androidx.navigation.ActivityNavigator navigator, @IdRes int id);
-    method public androidx.navigation.ActivityNavigator.Destination build();
-    method public String? getAction();
-    method public kotlin.reflect.KClass<? extends android.app.Activity>? getActivityClass();
-    method public android.net.Uri? getData();
-    method public String? getDataPattern();
-    method public String? getTargetPackage();
-    method public void setAction(String? p);
-    method public void setActivityClass(kotlin.reflect.KClass<? extends android.app.Activity>? p);
-    method public void setData(android.net.Uri? p);
-    method public void setDataPattern(String? p);
-    method public void setTargetPackage(String? p);
-    property public final String? action;
-    property public final kotlin.reflect.KClass<? extends android.app.Activity>? activityClass;
-    property public final android.net.Uri? data;
-    property public final String? dataPattern;
-    property public final String? targetPackage;
-  }
-
-  public final class ActivityNavigatorDestinationBuilderKt {
-    method public static inline void activity(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.ActivityNavigatorDestinationBuilder,kotlin.Unit> builder);
-  }
-
-  public final class ActivityNavigatorExtrasKt {
-    method public static androidx.navigation.ActivityNavigator.Extras ActivityNavigatorExtras(optional androidx.core.app.ActivityOptionsCompat? activityOptions, optional int flags);
-  }
-
-  public final class ViewKt {
-    method public static androidx.navigation.NavController findNavController(android.view.View);
-  }
-
-}
-
diff --git a/navigation/navigation-runtime-ktx/api/restricted_current.ignore b/navigation/navigation-runtime-ktx/api/restricted_current.ignore
@@ -1,5 +1,3 @@
 // Baseline format: 1.0
-RemovedClass: androidx.navigation.NavControllerKt:
-    Removed class androidx.navigation.NavControllerKt
-RemovedClass: androidx.navigation.NavHostKt:
-    Removed class androidx.navigation.NavHostKt
+RemovedPackage: androidx.navigation:
+    Removed package androidx.navigation
diff --git a/navigation/navigation-runtime-ktx/api/restricted_current.txt b/navigation/navigation-runtime-ktx/api/restricted_current.txt
@@ -1,45 +1 @@
 // Signature format: 4.0
-package androidx.navigation {
-
-  public final class ActivityKt {
-    method public static androidx.navigation.NavController findNavController(android.app.Activity, @IdRes int viewId);
-  }
-
-  public final class ActivityNavArgsLazyKt {
-    method @MainThread public static inline <reified Args extends androidx.navigation.NavArgs> androidx.navigation.NavArgsLazy<Args>! navArgs(android.app.Activity);
-  }
-
-  @androidx.navigation.NavDestinationDsl public final class ActivityNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.ActivityNavigator.Destination> {
-    ctor public ActivityNavigatorDestinationBuilder(androidx.navigation.ActivityNavigator navigator, @IdRes int id);
-    method public androidx.navigation.ActivityNavigator.Destination build();
-    method public String? getAction();
-    method public kotlin.reflect.KClass<? extends android.app.Activity>? getActivityClass();
-    method public android.net.Uri? getData();
-    method public String? getDataPattern();
-    method public String? getTargetPackage();
-    method public void setAction(String? p);
-    method public void setActivityClass(kotlin.reflect.KClass<? extends android.app.Activity>? p);
-    method public void setData(android.net.Uri? p);
-    method public void setDataPattern(String? p);
-    method public void setTargetPackage(String? p);
-    property public final String? action;
-    property public final kotlin.reflect.KClass<? extends android.app.Activity>? activityClass;
-    property public final android.net.Uri? data;
-    property public final String? dataPattern;
-    property public final String? targetPackage;
-  }
-
-  public final class ActivityNavigatorDestinationBuilderKt {
-    method public static inline void activity(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.ActivityNavigatorDestinationBuilder,kotlin.Unit> builder);
-  }
-
-  public final class ActivityNavigatorExtrasKt {
-    method public static androidx.navigation.ActivityNavigator.Extras ActivityNavigatorExtras(optional androidx.core.app.ActivityOptionsCompat? activityOptions, optional int flags);
-  }
-
-  public final class ViewKt {
-    method public static androidx.navigation.NavController findNavController(android.view.View);
-  }
-
-}
-
diff --git a/navigation/navigation-runtime-ktx/build.gradle b/navigation/navigation-runtime-ktx/build.gradle
@@ -28,24 +28,6 @@ plugins {
 
 dependencies {
     api(project(":navigation:navigation-runtime"))
-    // Ensure that the -ktx dependency graph mirrors the Java dependency graph
-    api(project(":navigation:navigation-common-ktx"))
-    api("androidx.activity:activity-ktx:1.1.0") {
-        because "Mirror navigation-runtime dependency graph for -ktx artifacts"
-    }
-    api("androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0") {
-        because "Mirror navigation-runtime dependency graph for -ktx artifacts"
-    }
-    api(KOTLIN_STDLIB)
-    androidTestImplementation(project(":internal-testutils-navigation"), {
-        exclude group: "androidx.navigation", module: "navigation-common-ktx"
-    })
-    androidTestImplementation(TRUTH)
-    androidTestImplementation(ANDROIDX_TEST_EXT_JUNIT)
-    androidTestImplementation(ANDROIDX_TEST_CORE)
-    androidTestImplementation(ANDROIDX_TEST_RUNNER)
-    androidTestImplementation(ANDROIDX_TEST_RULES)
-    androidTestImplementation(ESPRESSO_CORE)
 }
 
 androidx {

diff --git a/navigation/navigation-runtime-ktx/src/androidTest/AndroidManifest.xml b/navigation/navigation-runtime-ktx/src/androidTest/AndroidManifest.xml
@@ -15,9 +15,4 @@
   ~ limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="androidx.navigation.ktx">
-    <application>
-        <activity android:name="androidx.navigation.TestActivity"/>
-    </application>
-</manifest>
+<manifest package="androidx.navigation.ktx"/>
diff --git a/...tion/navigation-runtime-ktx/src/androidTest/java/androidx/navigation/NavControllerTest.kt b/...tion/navigation-runtime-ktx/src/androidTest/java/androidx/navigation/NavControllerTest.kt
diff --git a/navigation/navigation-runtime/api/api_lint.ignore b/navigation/navigation-runtime/api/api_lint.ignore
@@ -13,6 +13,14 @@ MissingBuildMethod: androidx.navigation.NavDeepLinkBuilder:
     androidx.navigation.NavDeepLinkBuilder does not declare a `build()` method, but builder classes are expected to
 
 
+MissingJvmstatic: androidx.navigation.ActivityNavigatorExtrasKt#ActivityNavigatorExtras(androidx.core.app.ActivityOptionsCompat, int):
+    A Kotlin method with default parameter values should be annotated with @JvmOverloads for better Java interoperability; see https://android.github.io/kotlin-guides/interop.html#function-overloads-for-defaults
+
+
+MissingNullability: androidx.navigation.ActivityNavArgsLazyKt#navArgs(android.app.Activity):
+    Missing nullability on method `navArgs` return
+
+
 NullableCollection: androidx.navigation.NavBackStackEntry#getArguments():
     Return type of method androidx.navigation.NavBackStackEntry.getArguments() is a nullable collection (`android.os.Bundle`); must be non-null
 NullableCollection: androidx.navigation.NavController#saveState():

diff --git a/navigation/navigation-runtime/api/current.txt b/navigation/navigation-runtime/api/current.txt
@@ -1,6 +1,14 @@
 // Signature format: 4.0
 package androidx.navigation {
 
+  public final class ActivityKt {
+    method public static androidx.navigation.NavController findNavController(android.app.Activity, @IdRes int viewId);
+  }
+
+  public final class ActivityNavArgsLazyKt {
+    method @MainThread public static inline <reified Args extends androidx.navigation.NavArgs> androidx.navigation.NavArgsLazy<Args>! navArgs(android.app.Activity);
+  }
+
   @androidx.navigation.Navigator.Name("activity") public class ActivityNavigator extends androidx.navigation.Navigator<androidx.navigation.ActivityNavigator.Destination> {
     ctor public ActivityNavigator(android.content.Context context);
     method public static final void applyPopAnimationsToPendingTransition(android.app.Activity activity);
@@ -51,6 +59,34 @@ package androidx.navigation {
     method public androidx.navigation.ActivityNavigator.Extras.Builder setActivityOptions(androidx.core.app.ActivityOptionsCompat activityOptions);
   }
 
+  @androidx.navigation.NavDestinationDsl public final class ActivityNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.ActivityNavigator.Destination> {
+    ctor public ActivityNavigatorDestinationBuilder(androidx.navigation.ActivityNavigator navigator, @IdRes int id);
+    method public androidx.navigation.ActivityNavigator.Destination build();
+    method public String? getAction();
+    method public kotlin.reflect.KClass<? extends android.app.Activity>? getActivityClass();
+    method public android.net.Uri? getData();
+    method public String? getDataPattern();
+    method public String? getTargetPackage();
+    method public void setAction(String? p);
+    method public void setActivityClass(kotlin.reflect.KClass<? extends android.app.Activity>? p);
+    method public void setData(android.net.Uri? p);
+    method public void setDataPattern(String? p);
+    method public void setTargetPackage(String? p);
+    property public final String? action;
+    property public final kotlin.reflect.KClass<? extends android.app.Activity>? activityClass;
+    property public final android.net.Uri? data;
+    property public final String? dataPattern;
+    property public final String? targetPackage;
+  }
+
+  public final class ActivityNavigatorDestinationBuilderKt {
+    method public static inline void activity(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.ActivityNavigatorDestinationBuilder,kotlin.Unit> builder);
+  }
+
+  public final class ActivityNavigatorExtrasKt {
+    method public static androidx.navigation.ActivityNavigator.Extras ActivityNavigatorExtras(optional androidx.core.app.ActivityOptionsCompat? activityOptions, optional int flags);
+  }
+
   public final class NavBackStackEntry implements androidx.lifecycle.HasDefaultViewModelProviderFactory androidx.lifecycle.LifecycleOwner androidx.savedstate.SavedStateRegistryOwner androidx.lifecycle.ViewModelStoreOwner {
     method public android.os.Bundle? getArguments();
     method public androidx.lifecycle.ViewModelProvider.Factory getDefaultViewModelProviderFactory();
@@ -173,5 +209,9 @@ package androidx.navigation {
     field public static final androidx.navigation.Navigation INSTANCE;
   }
 
+  public final class ViewKt {
+    method public static androidx.navigation.NavController findNavController(android.view.View);
+  }
+
 }