Make activity and fragment ktx mirror dependencies
When activity or fragment have an api transitive
dependency, we ensure that the activity-ktx and
fragment-ktx libraries have an api transitive
dependency on the -ktx version of those dependencies,
ensuring that they stay in sync with one another.
Test: ./gradlew bOS
Change-Id: I2c7d40656ee1f6113c9fdd795c9d6a378c9922ae
diff --git a/activity/activity-ktx/build.gradle b/activity/activity-ktx/build.gradle
index 3eb3f61..df50b6c 100644
--- a/activity/activity-ktx/build.gradle
+++ b/activity/activity-ktx/build.gradle
@@ -35,6 +35,9 @@
dependencies {
api(project(":activity:activity"))
+ api("androidx.core:core-ktx:1.1.0-rc01") {
+ because 'Mirror activity dependency graph for -ktx artifacts'
+ }
api(project(":lifecycle:lifecycle-runtime-ktx")) {
because 'Mirror activity dependency graph for -ktx artifacts'
}
diff --git a/activity/activity/build.gradle b/activity/activity/build.gradle
index 7fdc9fa..d4480b5 100644
--- a/activity/activity/build.gradle
+++ b/activity/activity/build.gradle
@@ -18,10 +18,7 @@
dependencies {
api("androidx.annotation:annotation:1.1.0")
- api("androidx.core:core:1.1.0-rc01") {
- exclude group: 'androidx.annotation'
- exclude group: 'com.google.guava', module: 'listenablefuture'
- }
+ api("androidx.core:core:1.1.0-rc01")
api(project(":lifecycle:lifecycle-runtime"))
api(project(":lifecycle:lifecycle-viewmodel"))
api(project(":savedstate"))
diff --git a/fragment/fragment-ktx/build.gradle b/fragment/fragment-ktx/build.gradle
index 1495d6d..45b7557 100644
--- a/fragment/fragment-ktx/build.gradle
+++ b/fragment/fragment-ktx/build.gradle
@@ -34,12 +34,20 @@
}
dependencies {
- api(project(":fragment:fragment")) {
- exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel'
- }
+ api(project(":fragment:fragment"))
api(project(":activity:activity-ktx")) {
because 'Mirror fragment dependency graph for -ktx artifacts'
}
+ api("androidx.core:core-ktx:1.1.0-rc01") {
+ because 'Mirror fragment dependency graph for -ktx artifacts'
+ }
+ api("androidx.collection:collection-ktx:1.1.0") {
+ because 'Mirror fragment dependency graph for -ktx artifacts'
+ }
+ api(project(":lifecycle:lifecycle-livedata-core-ktx")) {
+ because 'Mirror fragment dependency graph for -ktx artifacts'
+ }
+ api(project(":lifecycle:lifecycle-viewmodel-ktx"))
api(KOTLIN_STDLIB)
androidTestImplementation(JUNIT)
androidTestImplementation(TRUTH)
diff --git a/fragment/fragment/build.gradle b/fragment/fragment/build.gradle
index 1e2bc5a..c199145 100644
--- a/fragment/fragment/build.gradle
+++ b/fragment/fragment/build.gradle
@@ -18,9 +18,7 @@
dependencies {
api("androidx.annotation:annotation:1.1.0")
- api("androidx.core:core:1.1.0-rc01") {
- exclude group: 'androidx.annotation'
- }
+ api("androidx.core:core:1.1.0-rc01")
api("androidx.collection:collection:1.1.0")
api("androidx.viewpager:viewpager:1.0.0")
api("androidx.loader:loader:1.0.0")