Migrate from AndroidManifest to build.gradle for namespace
AGP has deprecated use of packageName in AndroidManifest and
instead wants everyone to use `android { namespace = "foo" }`
in build.gradle files.
Test: ./gradlew tasks -> still passes
Change-Id: I4fa03cacc7214011f3797c36dcb76c2984c7bf52
diff --git a/paging/integration-tests/testapp/build.gradle b/paging/integration-tests/testapp/build.gradle
index bb064965..82eccc1 100644
--- a/paging/integration-tests/testapp/build.gradle
+++ b/paging/integration-tests/testapp/build.gradle
@@ -55,6 +55,10 @@
}
}
+android {
+ namespace "androidx.paging.integration.testapp"
+}
+
// Allow usage of Kotlin's @OptIn.
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
diff --git a/paging/integration-tests/testapp/src/main/AndroidManifest.xml b/paging/integration-tests/testapp/src/main/AndroidManifest.xml
index 8bd2d51..07aa39b 100644
--- a/paging/integration-tests/testapp/src/main/AndroidManifest.xml
+++ b/paging/integration-tests/testapp/src/main/AndroidManifest.xml
@@ -13,8 +13,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.paging.integration.testapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"
diff --git a/paging/paging-compose/build.gradle b/paging/paging-compose/build.gradle
index 166f4cc..8a6a33b 100644
--- a/paging/paging-compose/build.gradle
+++ b/paging/paging-compose/build.gradle
@@ -53,3 +53,7 @@
runApiTasks = new RunApiTasks.Yes()
legacyDisableKotlinStrictApiMode = true
}
+
+android {
+ namespace "androidx.paging.compose"
+}
diff --git a/paging/paging-compose/integration-tests/paging-demos/build.gradle b/paging/paging-compose/integration-tests/paging-demos/build.gradle
index 4d9005b5..7e1b213 100644
--- a/paging/paging-compose/integration-tests/paging-demos/build.gradle
+++ b/paging/paging-compose/integration-tests/paging-demos/build.gradle
@@ -45,3 +45,7 @@
inceptionYear = "2020"
description = "This is a project for Paging demos."
}
+
+android {
+ namespace "androidx.paging.compose.demos"
+}
diff --git a/paging/paging-compose/integration-tests/paging-demos/src/main/AndroidManifest.xml b/paging/paging-compose/integration-tests/paging-demos/src/main/AndroidManifest.xml
index 1f0faaa..deac81d 100644
--- a/paging/paging-compose/integration-tests/paging-demos/src/main/AndroidManifest.xml
+++ b/paging/paging-compose/integration-tests/paging-demos/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.paging.compose.demos" />
+<manifest />
diff --git a/paging/paging-compose/samples/build.gradle b/paging/paging-compose/samples/build.gradle
index 1a9576b..d5b9c9f 100644
--- a/paging/paging-compose/samples/build.gradle
+++ b/paging/paging-compose/samples/build.gradle
@@ -41,3 +41,7 @@
inceptionYear = "2020"
description = "Contains the sample code for the Androidx Paging library compose interop"
}
+
+android {
+ namespace "androidx.paging.compose.samples"
+}
diff --git a/paging/paging-compose/samples/src/main/AndroidManifest.xml b/paging/paging-compose/samples/src/main/AndroidManifest.xml
index c9f148e..deac81d 100644
--- a/paging/paging-compose/samples/src/main/AndroidManifest.xml
+++ b/paging/paging-compose/samples/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
limitations under the License.
-->
-<manifest package="androidx.paging.compose.samples" />
+<manifest />
diff --git a/paging/paging-compose/src/androidTest/AndroidManifest.xml b/paging/paging-compose/src/androidTest/AndroidManifest.xml
index dbe6304..9cd4123 100644
--- a/paging/paging-compose/src/androidTest/AndroidManifest.xml
+++ b/paging/paging-compose/src/androidTest/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.paging.compose" />
+<manifest />
diff --git a/paging/paging-compose/src/main/AndroidManifest.xml b/paging/paging-compose/src/main/AndroidManifest.xml
index dbe6304..9cd4123 100644
--- a/paging/paging-compose/src/main/AndroidManifest.xml
+++ b/paging/paging-compose/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.paging.compose" />
+<manifest />
diff --git a/paging/paging-guava/build.gradle b/paging/paging-guava/build.gradle
index 1a1b463..10a8b75 100644
--- a/paging/paging-guava/build.gradle
+++ b/paging/paging-guava/build.gradle
@@ -47,6 +47,10 @@
legacyDisableKotlinStrictApiMode = true
}
+android {
+ namespace "androidx.paging.guava"
+}
+
// Allow usage of Kotlin's @OptIn.
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
diff --git a/paging/paging-guava/src/main/AndroidManifest.xml b/paging/paging-guava/src/main/AndroidManifest.xml
index ac2ee69..f15bef6 100644
--- a/paging/paging-guava/src/main/AndroidManifest.xml
+++ b/paging/paging-guava/src/main/AndroidManifest.xml
@@ -14,6 +14,5 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.paging.guava">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/paging/paging-runtime-ktx/build.gradle b/paging/paging-runtime-ktx/build.gradle
index f350d22..4ec8ec9 100644
--- a/paging/paging-runtime-ktx/build.gradle
+++ b/paging/paging-runtime-ktx/build.gradle
@@ -35,3 +35,7 @@
inceptionYear = "2018"
description = "Kotlin extensions for 'paging-runtime' artifact"
}
+
+android {
+ namespace "androidx.paging.runtime.ktx"
+}
diff --git a/paging/paging-runtime-ktx/src/main/AndroidManifest.xml b/paging/paging-runtime-ktx/src/main/AndroidManifest.xml
index 344917f..61b6811 100644
--- a/paging/paging-runtime-ktx/src/main/AndroidManifest.xml
+++ b/paging/paging-runtime-ktx/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.paging.runtime.ktx"/>
+<manifest />
diff --git a/paging/paging-runtime/build.gradle b/paging/paging-runtime/build.gradle
index 5fed201..9a32fcd 100644
--- a/paging/paging-runtime/build.gradle
+++ b/paging/paging-runtime/build.gradle
@@ -27,6 +27,7 @@
defaultConfig {
multiDexEnabled true
}
+ namespace "androidx.paging.runtime"
}
dependencies {
diff --git a/paging/paging-runtime/src/main/AndroidManifest.xml b/paging/paging-runtime/src/main/AndroidManifest.xml
index 5f0d628e..7b5bc6e 100644
--- a/paging/paging-runtime/src/main/AndroidManifest.xml
+++ b/paging/paging-runtime/src/main/AndroidManifest.xml
@@ -13,4 +13,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest package="androidx.paging.runtime"/>
+<manifest />
diff --git a/paging/paging-rxjava2-ktx/build.gradle b/paging/paging-rxjava2-ktx/build.gradle
index 81ebe3d..0d9d6d8 100644
--- a/paging/paging-rxjava2-ktx/build.gradle
+++ b/paging/paging-rxjava2-ktx/build.gradle
@@ -42,3 +42,7 @@
inceptionYear = "2018"
description = "Kotlin extensions for 'paging-rxjava2' artifact"
}
+
+android {
+ namespace "androidx.paging.rxjava2.ktx"
+}
diff --git a/paging/paging-rxjava2-ktx/src/main/AndroidManifest.xml b/paging/paging-rxjava2-ktx/src/main/AndroidManifest.xml
index bdff181..dd3d3a3 100644
--- a/paging/paging-rxjava2-ktx/src/main/AndroidManifest.xml
+++ b/paging/paging-rxjava2-ktx/src/main/AndroidManifest.xml
@@ -13,4 +13,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.paging.rxjava2.ktx"/>
+<manifest />
diff --git a/paging/paging-rxjava2/build.gradle b/paging/paging-rxjava2/build.gradle
index 771eee2..64d838a 100644
--- a/paging/paging-rxjava2/build.gradle
+++ b/paging/paging-rxjava2/build.gradle
@@ -55,6 +55,10 @@
legacyDisableKotlinStrictApiMode = true
}
+android {
+ namespace "androidx.paging.rxjava2"
+}
+
// Allow usage of Kotlin's @OptIn.
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
diff --git a/paging/paging-rxjava2/src/androidTest/AndroidManifest.xml b/paging/paging-rxjava2/src/androidTest/AndroidManifest.xml
index c853765..61b6811 100644
--- a/paging/paging-rxjava2/src/androidTest/AndroidManifest.xml
+++ b/paging/paging-rxjava2/src/androidTest/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.paging.rxjava2"/>
+<manifest />
diff --git a/paging/paging-rxjava2/src/main/AndroidManifest.xml b/paging/paging-rxjava2/src/main/AndroidManifest.xml
index 4552633..f15bef6 100644
--- a/paging/paging-rxjava2/src/main/AndroidManifest.xml
+++ b/paging/paging-rxjava2/src/main/AndroidManifest.xml
@@ -14,6 +14,5 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.paging.rxjava2">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/paging/paging-rxjava3/build.gradle b/paging/paging-rxjava3/build.gradle
index 5cd5bf6..58cb03c 100644
--- a/paging/paging-rxjava3/build.gradle
+++ b/paging/paging-rxjava3/build.gradle
@@ -53,6 +53,10 @@
legacyDisableKotlinStrictApiMode = true
}
+android {
+ namespace "androidx.paging.rxjava3"
+}
+
// Allow usage of Kotlin's @OptIn.
tasks.withType(KotlinCompile).configureEach {
kotlinOptions {
diff --git a/paging/paging-rxjava3/src/androidTest/AndroidManifest.xml b/paging/paging-rxjava3/src/androidTest/AndroidManifest.xml
index 2788f86..3c3c224 100644
--- a/paging/paging-rxjava3/src/androidTest/AndroidManifest.xml
+++ b/paging/paging-rxjava3/src/androidTest/AndroidManifest.xml
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<manifest package="androidx.paging.rxjava3"/>
+<manifest />
diff --git a/paging/paging-rxjava3/src/main/AndroidManifest.xml b/paging/paging-rxjava3/src/main/AndroidManifest.xml
index df90e392..9a93f59 100644
--- a/paging/paging-rxjava3/src/main/AndroidManifest.xml
+++ b/paging/paging-rxjava3/src/main/AndroidManifest.xml
@@ -14,6 +14,5 @@
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.paging.rxjava3">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
diff --git a/paging/samples/build.gradle b/paging/samples/build.gradle
index a6b63e4..3bb5bd9 100644
--- a/paging/samples/build.gradle
+++ b/paging/samples/build.gradle
@@ -27,6 +27,7 @@
defaultConfig {
multiDexEnabled true
}
+ namespace "androidx.paging.samples"
}
dependencies {
diff --git a/paging/samples/src/main/AndroidManifest.xml b/paging/samples/src/main/AndroidManifest.xml
index 344848e..eda0e80 100644
--- a/paging/samples/src/main/AndroidManifest.xml
+++ b/paging/samples/src/main/AndroidManifest.xml
@@ -13,5 +13,4 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="androidx.paging.samples"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
