12 files changed, 20 insertions, 6 deletions
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" />