Bump AGP and Gradle (#6489)

50 files changed, 111 insertions, 46 deletions

diff --git a/app/build.gradle b/app/build.gradle
index d277f2279..d6baaaf98 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,11 +1,13 @@
 plugins {
     id('com.android.application')
-    id('com.github.triplet.play') version '3.7.0' apply false
+    id('com.github.triplet.play') version '3.8.3' apply false
 }
 apply from: "../common.gradle"
 apply from: "../playFlavor.gradle"
 
 android {
+    namespace "de.danoeh.antennapod"
+
     defaultConfig {
         // Version code schema:
         // "1.2.3-beta4"    -> 1020304
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 95b0c1614..cb15ba7de 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="de.danoeh.antennapod"
     android:installLocation="auto">
 
     <uses-permission android:name="android.permission.INTERNET"/>
diff --git a/app/src/play/AndroidManifest.xml b/app/src/play/AndroidManifest.xml
index dcf82e44a..a3e879081 100644
--- a/app/src/play/AndroidManifest.xml
+++ b/app/src/play/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-   package="de.danoeh.antennapod">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
         <meta-data
diff --git a/build.gradle b/build.gradle
index 2f87b706e..449de8584 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,9 +5,9 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.0"
-        classpath 'org.codehaus.groovy:groovy-xml:3.0.9'
+        classpath 'org.codehaus.groovy:groovy-xml:3.0.13'
     }
 }
 
diff --git a/core/build.gradle b/core/build.gradle
index a44f67c61..bff9eda59 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -5,6 +5,8 @@ apply from: "../common.gradle"
 apply from: "../playFlavor.gradle"
 
 android {
+    namespace "de.danoeh.antennapod.core"
+
     lint {
         disable "InvalidPeriodicWorkRequestInterval", "ObsoleteLintCustomCheck", "DefaultLocale", "UnusedAttribute",
                 "ParcelClassLoader", "CheckResult", "TrustAllX509TrustManager",
diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
index e186a856f..71cf676a0 100644
--- a/core/src/main/AndroidManifest.xml
+++ b/core/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" package="de.danoeh.antennapod.core">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
diff --git a/event/build.gradle b/event/build.gradle
index b1efac85d..bd90d1036 100644
--- a/event/build.gradle
+++ b/event/build.gradle
@@ -3,6 +3,10 @@ plugins {
 }
 apply from: "../common.gradle"
 
+android {
+    namespace "de.danoeh.antennapod.event"
+}
+
 dependencies {
     implementation project(':model')
     implementation "androidx.core:core:$coreVersion"
diff --git a/event/src/main/AndroidManifest.xml b/event/src/main/AndroidManifest.xml
deleted file mode 100644
index 7561cf555..000000000
--- a/event/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest package="de.danoeh.antennapod.event" />
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180f2..c1962a79e 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8049c684f..37aef8d3f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index c53aefaa5..aeb74cbb4 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -143,12 +140,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
@@ -205,6 +210,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f93..6689b85be 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.

 @rem

 

-@if "%DEBUG%" == "" @echo off

+@if "%DEBUG%"=="" @echo off

 @rem ##########################################################################

 @rem

 @rem  Gradle startup script for Windows

@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal

 

 set DIRNAME=%~dp0

-if "%DIRNAME%" == "" set DIRNAME=.

+if "%DIRNAME%"=="" set DIRNAME=.

+@rem This is normally unused

 set APP_BASE_NAME=%~n0

 set APP_HOME=%DIRNAME%

 

@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 

 set JAVA_EXE=java.exe

 %JAVA_EXE% -version >NUL 2>&1

-if "%ERRORLEVEL%" == "0" goto execute

+if %ERRORLEVEL% equ 0 goto execute

 

 echo.

 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 

 :end

 @rem End local scope for the variables with windows NT shell

-if "%ERRORLEVEL%"=="0" goto mainEnd

+if %ERRORLEVEL% equ 0 goto mainEnd

 

 :fail

 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of

 rem the _cmd.exe /c_ return code!

-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1

-exit /b 1

+set EXIT_CODE=%ERRORLEVEL%

+if %EXIT_CODE% equ 0 set EXIT_CODE=1

+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%

+exit /b %EXIT_CODE%

 

 :mainEnd

 if "%OS%"=="Windows_NT" endlocal

diff --git a/model/build.gradle b/model/build.gradle
index 751a52ef6..93da356f7 100644
--- a/model/build.gradle
+++ b/model/build.gradle
@@ -3,6 +3,10 @@ plugins {
 }
 apply from: "../common.gradle"
 
+android {
+    namespace "de.danoeh.antennapod.model"
+}
+
 dependencies {
     annotationProcessor "androidx.annotation:annotation:$annotationVersion"
     implementation "androidx.media:media:$mediaVersion"
diff --git a/model/src/main/AndroidManifest.xml b/model/src/main/AndroidManifest.xml
deleted file mode 100644
index 968649054..000000000
--- a/model/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest package="de.danoeh.antennapod.model" />
diff --git a/net/common/build.gradle b/net/common/build.gradle
index c519aa653..67efdf43f 100644
--- a/net/common/build.gradle
+++ b/net/common/build.gradle
@@ -3,6 +3,10 @@ plugins {
 }
 apply from: "../../common.gradle"
 
+android {
+    namespace "de.danoeh.antennapod.net.common"
+}
+
 dependencies {
     annotationProcessor "androidx.annotation:annotation:$annotationVersion"
     implementation "com.squareup.okhttp3:okhttp:$okhttpVersion"
diff --git a/net/common/src/main/AndroidManifest.xml b/net/common/src/main/AndroidManifest.xml
deleted file mode 100644
index 702944daa..000000000
--- a/net/common/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest package="de.danoeh.antennapod.net.common" />
diff --git a/net/discovery/build.gradle b/net/discovery/build.gradle
index 43ec26857..df47258fa 100644
--- a/net/discovery/build.gradle
+++ b/net/discovery/build.gradle
@@ -5,6 +5,8 @@ apply from: "../../common.gradle"
 apply from: "../../playFlavor.gradle"
 
 android {
+    namespace "de.danoeh.antennapod.net.discovery"
+
     defaultConfig {
         if (project.hasProperty("podcastindexApiKey")) {
             buildConfigField "String", "PODCASTINDEX_API_KEY", '"' + podcastindexApiKey + '"'
diff --git a/net/discovery/src/main/AndroidManifest.xml b/net/discovery/src/main/AndroidManifest.xml
deleted file mode 100644
index 3e42a802a..000000000
--- a/net/discovery/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest package="de.danoeh.antennapod.net.discovery" />
diff --git a/net/download/service-interface/build.gradle b/net/download/service-interface/build.gradle
index 5779ab51d..784c1375f 100644
--- a/net/download/service-interface/build.gradle
+++ b/net/download/service-interface/build.gradle
@@ -5,6 +5,8 @@ plugins {
 apply from: "../../../common.gradle"
 
 android {
+    namespace "de.danoeh.antennapod.net.download.serviceinterface"
+
     lint {
         disable 'ParcelClassLoader'
     }
diff --git a/net/download/service-interface/src/main/AndroidManifest.xml b/net/download/service-interface/src/main/AndroidManifest.xml
deleted file mode 100644
index df6365325..000000000
--- a/net/download/service-interface/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest package="de.danoeh.antennapod.net.download.serviceinterface" />
diff --git a/net/ssl/build.gradle b/net/ssl/build.gradle
index 0ac9d7110..5f8d496f6 100644
--- a/net/ssl/build.gradle
+++ b/net/ssl/build.gradle
@@ -4,6 +4,10 @@ plugins {
 apply from: "../../common.gradle"
 apply from: "../../playFlavor.gradle"
 
+android {
+    namespace "de.danoeh.antennapod.net.ssl"
+}
+
 dependencies {
     annotationProcessor "androidx.annotation:annotation:$annotationVersion"
     implementation "androidx.appcompat:appcompat:$appcompatVersion"
diff --git a/net/ssl/src/main/AndroidManifest.xml b/net/ssl/src/main/AndroidManifest.xml
deleted file mode 100644
index 2acf91510..000000000
--- a/net/ssl/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest package="de.danoeh.antennapod.net.ssl" />
diff --git a/net/sync/gpoddernet/build.gradle b/net/sync/gpoddernet/build.gradle
index bea35d793..ff1fc2f00 100644
--- a/net/sync/gpoddernet/build.gradle
+++ b/net/sync/gpoddernet/build.gradle
@@ -3,6 +3,10 @@ plugins {
 }
 apply from: "../../../common.gradle"
 
+android {
+    namespace "de.danoeh.antennapod.net.sync.gpoddernet"
+}
+
 dependencies {
     implementation project(':net:sync:model')
 
diff --git a/net/sync/gpoddernet/src/main/AndroidManifest.xml b/net/sync/gpoddernet/src/main/AndroidManifest.xml
deleted file mode 100644
index df37bed3c..000000000
--- a/net/sync/gpoddernet/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest package="de.danoeh.antennapod.net.sync.gpoddernet" />
diff --git a/net/sync/model/build.gradle b/net/sync/model/build.gradle
index 205a00fb0..8520b0a49 100644
--- a/net/sync/model/build.gradle
+++ b/net/sync/model/build.gradle
@@ -3,6 +3,10 @@ plugins {
 }
 apply from: "../../../common.gradle"
 
+android {
+    namespace "de.danoeh.antennapod.net.sync.model"
+}
+
 dependencies {
     implementation project(':model')
 
diff --git a/net/sync/model/src/main/AndroidManifest.xml b/net/sync/model/src/main/AndroidManifest.xml
deleted file mode 100644
index a7bd1e34b..000000000
--- a/net/sync/model/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest package="de.danoeh.antennapod.net.sync.model" />
diff --git a/parser/feed/build.gradle b/parser/feed/build.gradle
index faabe662c..e06aa7637 100644
--- a/parser/feed/build.gradle
+++ b/parser/feed/build.gradle
@@ -3,6 +3,10 @@ plugins {
 }
 apply from: "../../common.gradle"
 
+android {
+    namespace "de.danoeh.antennapod.parser.feed"
+}
+
 dependencies {
     implementation project(':model')
 
diff --git a/parser/feed/src/main/AndroidManifest.xml b/parser/feed/src/main/AndroidManifest.xml
deleted file mode 100644
index 44b10f29a..000000000
--- a/parser/feed/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest package="de.danoeh.antennapod.parser.feed" />
diff --git a/parser/media/build.gradle b/parser/media/build.gradle
index 7dce7b86a..1cec0c348 100644
--- a/parser/media/build.gradle
+++ b/parser/media/build.gradle
@@ -3,6 +3,10 @@ plugins {
 }
 apply from: "../../common.gradle"
 
+android {
+    namespace "de.danoeh.antennapod.parser.media"
+}
+
 dependencies {
     implementation project(':model')
 
diff --git a/parser/media/src/main/AndroidManifest.xml b/parser/media/src/main/AndroidManifest.xml
deleted file mode 100644
index c440f1553..000000000
--- a/parser/media/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest package="de.danoeh.antennapod.parser.media" />
diff --git a/playback/base/build.gradle b/playback/base/build.gradle
index df49b2fb6..9c1e9ae4c 100644
--- a/playback/base/build.gradle
+++ b/playback/base/build.gradle
@@ -3,6 +3,10 @@ plugins {
 }
 apply from: "../../common.gradle"
 
+android {
+    namespace "de.danoeh.antennapod.playback.base"
+}
+
 dependencies {
     implementation project(':model')
 
diff --git a/playback/base/src/main/AndroidManifest.xml b/playback/base/src/main/AndroidManifest.xml
deleted file mode 100644
index c6a44a212..000000000
--- a/playback/base/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest package="de.danoeh.antennapod.playback.base" />
diff --git a/playback/cast/build.gradle b/playback/cast/build.gradle
index b2aefddf2..3025a369c 100644
--- a/playback/cast/build.gradle
+++ b/playback/cast/build.gradle
@@ -4,6 +4,10 @@ plugins {
 apply from: "../../common.gradle"
 apply from: "../../playFlavor.gradle"
 
+android {
+    namespace "de.danoeh.antennapod.playback.cast"
+}
+
 dependencies {
     implementation project(':event')
     implementation project(':model')
diff --git a/playback/cast/src/main/AndroidManifest.xml b/playback/cast/src/main/AndroidManifest.xml
deleted file mode 100644
index 58c2b9396..000000000
--- a/playback/cast/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest package="de.danoeh.antennapod.playback.cast" />
diff --git a/storage/database/build.gradle b/storage/database/build.gradle
index 0dc5cef63..283827ad3 100644
--- a/storage/database/build.gradle
+++ b/storage/database/build.gradle
@@ -4,6 +4,8 @@ plugins {
 apply from: "../../common.gradle"
 
 android {
+    namespace "de.danoeh.antennapod.storage.database"
+
     lint {
         disable "StaticFieldLeak", "StringFormatCount", "StringFormatMatches", "StringFormatInvalid", "PluralsCandidate", "StringFormatTrivial"
     }
diff --git a/storage/database/src/main/AndroidManifest.xml b/storage/database/src/main/AndroidManifest.xml
deleted file mode 100644
index df0171d12..000000000
--- a/storage/database/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest package="de.danoeh.antennapod.storage.database" />
diff --git a/storage/preferences/build.gradle b/storage/preferences/build.gradle
index 0da810e28..51a5e90fd 100644
--- a/storage/preferences/build.gradle
+++ b/storage/preferences/build.gradle
@@ -4,6 +4,8 @@ plugins {
 apply from: "../../common.gradle"
 
 android {
+    namespace "de.danoeh.antennapod.storage.preferences"
+
     lint {
         disable "StaticFieldLeak"
     }
diff --git a/storage/preferences/src/main/AndroidManifest.xml b/storage/preferences/src/main/AndroidManifest.xml
deleted file mode 100644
index b3a9b9def..000000000
--- a/storage/preferences/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest package="de.danoeh.antennapod.storage.preferences" />
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" />