Remove warning about duplicate package
Upgrade room test app to newer appcompat, and leanback to pin to a fixed
version of vectordrawable-animated to stop the following warning:
Package name 'androidx.vectordrawable' used in:
androidx.vectordrawable:vectordrawable-animated:1.0.0, androidx.vectordrawable:vectordrawable:1.0.0
Test: ./gradlew processWithExpandProjectionDebugMainManifest
Change-Id: Iec27b0a0673e47dfff1e4e91b9cd8a6f7c94c7b1
diff --git a/browser/browser/build.gradle b/browser/browser/build.gradle
index c900186..c5f3330 100644
--- a/browser/browser/build.gradle
+++ b/browser/browser/build.gradle
@@ -33,7 +33,7 @@
testImplementation(libs.robolectric)
testImplementation(libs.mockitoCore)
- androidTestImplementation("androidx.appcompat:appcompat:1.0.0")
+ androidTestImplementation("androidx.appcompat:appcompat:1.1.0")
androidTestImplementation(libs.testExtJunit)
androidTestImplementation(libs.testCore)
androidTestImplementation(libs.testRunner)
diff --git a/development/build_log_simplifier/messages.ignore b/development/build_log_simplifier/messages.ignore
index a337492..5870437 100644
--- a/development/build_log_simplifier/messages.ignore
+++ b/development/build_log_simplifier/messages.ignore
@@ -241,12 +241,6 @@
# > Task :startup:integration-tests:first-library:processDebugManifest
\$SUPPORT/startup/integration\-tests/first\-library/src/main/AndroidManifest\.xml:[0-9]+:[0-9]+\-[0-9]+:[0-9]+ Warning:
meta\-data\#androidx\.work\.WorkManagerInitializer was tagged at AndroidManifest\.xml\:[0-9]+ to remove other declarations but no other declaration present
-# > Task :camera:integration-tests:camera-testapp-extensions:compileDebugJavaWithJavac
-# > Task :camera:integration-tests:camera-testapp-core:compileDebugJavaWithJavac
-# > Task :room:integration-tests:room-testapp:processDebugMainManifest
-\[androidx\.vectordrawable:vectordrawable\-animated:[0-9]+\.[0-9]+\.[0-9]+\] \$GRADLE_USER_HOME/caches/transforms\-[0-9]+/[0-9a-f]{32}/transformed/vectordrawable\-animated\-[0-9]+\.[0-9]+\.[0-9]+/AndroidManifest\.xml Warning:
-Package name 'androidx\.vectordrawable' used in: androidx\.vectordrawable:vectordrawable\-animated:[0-9]+\.[0-9]+\.[0-9]+, androidx\.vectordrawable:vectordrawable:[0-9]+\.[0-9]+\.[0-9]+\.
-# > Task :lifecycle:integration-tests:lifecycle-testapp:compileDebugJavaWithJavac
# > Task :support-slices-demos:compileDebugJavaWithJavac
Note: \$SUPPORT/samples/SupportSliceDemos/src/main/java/com/example/androidx/slice/demos/SliceBrowser\.java uses unchecked or unsafe operations\.
# > Task :emoji2:emoji2-benchmark:processReleaseAndroidTestManifest
diff --git a/leanback/leanback-paging/build.gradle b/leanback/leanback-paging/build.gradle
index 72cc71c..579f307 100644
--- a/leanback/leanback-paging/build.gradle
+++ b/leanback/leanback-paging/build.gradle
@@ -14,6 +14,10 @@
api("androidx.leanback:leanback:1.1.0-beta01")
api("androidx.paging:paging-runtime:3.0.0")
+ // To avoid manifest merger warnings due to duplicate package names
+ // It can be removed if leanback library is updated to a newer version
+ implementation("androidx.vectordrawable:vectordrawable-animated:1.1.0")
+
androidTestImplementation(libs.testExtJunit)
androidTestImplementation(libs.testCore)
androidTestImplementation(libs.testRunner)
diff --git a/leanback/leanback-tab/build.gradle b/leanback/leanback-tab/build.gradle
index f7db959..0f7b64b 100644
--- a/leanback/leanback-tab/build.gradle
+++ b/leanback/leanback-tab/build.gradle
@@ -12,6 +12,10 @@
api("com.google.android.material:material:1.0.0")
api("androidx.viewpager:viewpager:1.0.0")
+ // To avoid manifest merger warnings due to duplicate package names
+ // It can be removed if material library is updated to a newer version
+ implementation("androidx.vectordrawable:vectordrawable-animated:1.1.0")
+
androidTestImplementation(libs.testExtJunit)
androidTestImplementation(libs.testCore)
androidTestImplementation(libs.testRunner)
diff --git a/leanback/leanback/build.gradle b/leanback/leanback/build.gradle
index 7f7d047..b6dc59a 100644
--- a/leanback/leanback/build.gradle
+++ b/leanback/leanback/build.gradle
@@ -17,6 +17,10 @@
api("androidx.recyclerview:recyclerview:1.2.0-rc01")
api("androidx.appcompat:appcompat:1.0.0")
+ // To avoid manifest merger warnings due to duplicate package names
+ // It can be removed if appcompat library is updated to a newer version
+ implementation("androidx.vectordrawable:vectordrawable-animated:1.1.0")
+
androidTestImplementation(libs.kotlinStdlib)
androidTestImplementation(libs.testExtJunit)
androidTestImplementation(libs.testCore)
diff --git a/lifecycle/lifecycle-extensions/build.gradle b/lifecycle/lifecycle-extensions/build.gradle
index fd2e937..e2a5747 100644
--- a/lifecycle/lifecycle-extensions/build.gradle
+++ b/lifecycle/lifecycle-extensions/build.gradle
@@ -47,7 +47,7 @@
androidTestImplementation(libs.testRunner)
androidTestImplementation(libs.testRules)
androidTestImplementation(libs.espressoCore)
- androidTestImplementation("androidx.appcompat:appcompat:1.0.0")
+ androidTestImplementation("androidx.appcompat:appcompat:1.1.0")
androidTestImplementation(project(":internal-testutils-runtime"))
}
diff --git a/room/integration-tests/testapp/build.gradle b/room/integration-tests/testapp/build.gradle
index b68217d..3f9b1b1 100644
--- a/room/integration-tests/testapp/build.gradle
+++ b/room/integration-tests/testapp/build.gradle
@@ -85,7 +85,7 @@
// libs.findbugs dependency resolves an app/testapp version conflict.
implementation(libs.findbugs)
implementation("androidx.recyclerview:recyclerview:1.0.0")
- implementation("androidx.appcompat:appcompat:1.0.0")
+ implementation("androidx.appcompat:appcompat:1.3.1")
// use the shadowed dependency in tests so that if the shadowing does not work properly,
// our tests fail.
annotationProcessor project(path: ":room:room-compiler",
