From 4414fe99593afbdfe2c9992d26e8f02e4609f881 Mon Sep 17 00:00:00 2001
From: Ian Lake <ilake@google.com>
Date: Wed, 9 Jun 2021 17:19:58 -0700
Subject: [PATCH] Ensure Navigation KTX artifacts include transitive KTX

Even though the -ktx artifacts of Navigation are now
empty, apps that still depend on one of the -ktx
artifacts should still automatically update the
transitive -ktx artifacts as before.

Test: ./gradlew bOS
Change-Id: Iaf419287c948ca89aae055819b9f391d4dd04fa7
---
 navigation/navigation-fragment-ktx/build.gradle | 3 +++
 navigation/navigation-runtime-ktx/build.gradle  | 3 +++
 navigation/navigation-ui-ktx/build.gradle       | 3 +++
 navigation/navigation-ui/build.gradle           | 2 +-
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/navigation/navigation-fragment-ktx/build.gradle b/navigation/navigation-fragment-ktx/build.gradle
index ea68cc81763ac..b145047a421d8 100644
--- a/navigation/navigation-fragment-ktx/build.gradle
+++ b/navigation/navigation-fragment-ktx/build.gradle
@@ -25,6 +25,9 @@ plugins {
 
 dependencies {
     api(project(":navigation:navigation-fragment"))
+    api(project(":navigation:navigation-runtime-ktx")) {
+        because 'Mirror navigation-fragment dependency graph for -ktx artifacts'
+    }
 }
 
 androidx {
diff --git a/navigation/navigation-runtime-ktx/build.gradle b/navigation/navigation-runtime-ktx/build.gradle
index 5beadd463886f..810f04ce50505 100644
--- a/navigation/navigation-runtime-ktx/build.gradle
+++ b/navigation/navigation-runtime-ktx/build.gradle
@@ -25,6 +25,9 @@ plugins {
 
 dependencies {
     api(project(":navigation:navigation-runtime"))
+    api(project(":navigation:navigation-common-ktx")) {
+        because 'Mirror navigation-runtime dependency graph for -ktx artifacts'
+    }
 }
 
 androidx {
diff --git a/navigation/navigation-ui-ktx/build.gradle b/navigation/navigation-ui-ktx/build.gradle
index a45c3cfa49df5..848078058d308 100644
--- a/navigation/navigation-ui-ktx/build.gradle
+++ b/navigation/navigation-ui-ktx/build.gradle
@@ -25,6 +25,9 @@ plugins {
 
 dependencies {
     api(project(":navigation:navigation-ui"))
+    api(project(":navigation:navigation-runtime-ktx")) {
+        because 'Mirror navigation-ui dependency graph for -ktx artifacts'
+    }
 }
 
 androidx {
diff --git a/navigation/navigation-ui/build.gradle b/navigation/navigation-ui/build.gradle
index 60c9b7a2c8a7d..6ddfcd5e7a89b 100644
--- a/navigation/navigation-ui/build.gradle
+++ b/navigation/navigation-ui/build.gradle
@@ -35,7 +35,7 @@ android {
 }
 
 dependencies {
-    api(project(":navigation:navigation-runtime-ktx"))
+    api(project(":navigation:navigation-runtime"))
     api("androidx.customview:customview:1.1.0")
     api("androidx.drawerlayout:drawerlayout:1.1.1")
     api("com.google.android.material:material:1.4.0-beta01")