Bump AGP and Gradle (#6489)

12 files changed, 20 insertions, 6 deletions

diff --git a/ui/app-start-intent/build.gradle b/ui/app-start-intent/build.gradle
index 1f5161392..5ff5a48d0 100644
--- a/ui/app-start-intent/build.gradle
+++ b/ui/app-start-intent/build.gradle
@@ -3,6 +3,10 @@ plugins {
 }
 apply from: "../../common.gradle"
 
+android {
+    namespace "de.danoeh.antennapod.ui.appstartintent"
+}
+
 dependencies {
     annotationProcessor "androidx.annotation:annotation:$annotationVersion"
 }
diff --git a/ui/app-start-intent/src/main/AndroidManifest.xml b/ui/app-start-intent/src/main/AndroidManifest.xml
deleted file mode 100644
index 9296616f9..000000000
--- a/ui/app-start-intent/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest package="de.danoeh.antennapod.ui.appstartintent" />
diff --git a/ui/common/build.gradle b/ui/common/build.gradle
index 0603eb711..2771cac72 100644
--- a/ui/common/build.gradle
+++ b/ui/common/build.gradle
@@ -3,6 +3,10 @@ plugins {
 }
 apply from: "../../common.gradle"
 
+android {
+    namespace "de.danoeh.antennapod.ui.common"
+}
+
 dependencies {
     implementation project(":ui:i18n")
 
diff --git a/ui/common/src/main/AndroidManifest.xml b/ui/common/src/main/AndroidManifest.xml
deleted file mode 100644
index bae316f55..000000000
--- a/ui/common/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest package="de.danoeh.antennapod.ui.common" />
diff --git a/ui/glide/build.gradle b/ui/glide/build.gradle
index 81b5eeeaa..d518e1d69 100644
--- a/ui/glide/build.gradle
+++ b/ui/glide/build.gradle
@@ -4,6 +4,10 @@ plugins {
 apply from: "../../common.gradle"
 apply from: "../../playFlavor.gradle"
 
+android {
+    namespace "de.danoeh.antennapod.ui.glide"
+}
+
 dependencies {
     implementation project(":model")
     implementation project(":core")
diff --git a/ui/glide/src/main/AndroidManifest.xml b/ui/glide/src/main/AndroidManifest.xml
deleted file mode 100644
index ddc027b29..000000000
--- a/ui/glide/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest package="de.danoeh.antennapod.ui.glide" />
diff --git a/ui/i18n/build.gradle b/ui/i18n/build.gradle
index 4f5370662..c903d0e94 100644
--- a/ui/i18n/build.gradle
+++ b/ui/i18n/build.gradle
@@ -4,6 +4,8 @@ plugins {
 apply from: "../../common.gradle"
 
 android {
+    namespace "de.danoeh.antennapod.ui.i18n"
+
     lint {
         disable "Typos", "ExtraTranslation", "ImpliedQuantity",
                 "PluralsCandidate", "UnusedQuantity", "TypographyEllipsis"
diff --git a/ui/i18n/src/main/AndroidManifest.xml b/ui/i18n/src/main/AndroidManifest.xml
deleted file mode 100644
index 8729444b0..000000000
--- a/ui/i18n/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest package="de.danoeh.antennapod.ui.i18n" />
diff --git a/ui/png-icons/build.gradle b/ui/png-icons/build.gradle
index ad0b9d0b0..a9cbffcbb 100644
--- a/ui/png-icons/build.gradle
+++ b/ui/png-icons/build.gradle
@@ -4,6 +4,8 @@ plugins {
 apply from: "../../common.gradle"
 
 android {
+    namespace "de.danoeh.antennapod.ui.pngicons"
+
     defaultConfig {
         vectorDrawables.useSupportLibrary false
         vectorDrawables.generatedDensities = ["xhdpi"]
diff --git a/ui/png-icons/src/main/AndroidManifest.xml b/ui/png-icons/src/main/AndroidManifest.xml
deleted file mode 100644
index 782f0aa5f..000000000
--- a/ui/png-icons/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest package="de.danoeh.antennapod.ui.pngicons" />
diff --git a/ui/statistics/build.gradle b/ui/statistics/build.gradle
index 346fff253..7dafcba55 100644
--- a/ui/statistics/build.gradle
+++ b/ui/statistics/build.gradle
@@ -4,6 +4,10 @@ plugins {
 apply from: "../../common.gradle"
 apply from: "../../playFlavor.gradle"
 
+android {
+    namespace "de.danoeh.antennapod.ui.statistics"
+}
+
 dependencies {
     implementation project(":core")
     implementation project(":event")
diff --git a/ui/statistics/src/main/AndroidManifest.xml b/ui/statistics/src/main/AndroidManifest.xml
deleted file mode 100644
index 59c5bd42c..000000000
--- a/ui/statistics/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest package="de.danoeh.antennapod.ui.statistics" />