From ecae8449ed06a87a1594f3f7bd39cee3c674fdf8 Mon Sep 17 00:00:00 2001
From: Niels van Velzen <git@ndat.nl>
Date: Sat, 24 Sep 2022 17:33:42 +0200
Subject: [PATCH] Move package declaration to Gradle build files

---
 app/src/main/AndroidManifest.xml                | 1 -
 playback/core/build.gradle.kts                  | 1 +
 playback/core/src/main/AndroidManifest.xml      | 3 +--
 playback/exoplayer/build.gradle.kts             | 1 +
 playback/exoplayer/src/main/AndroidManifest.xml | 3 +--
 playback/jellyfin/build.gradle.kts              | 1 +
 playback/jellyfin/src/main/AndroidManifest.xml  | 3 +--
 playback/ui/build.gradle.kts                    | 1 +
 playback/ui/src/main/AndroidManifest.xml        | 3 +--
 preference/build.gradle.kts                     | 1 +
 preference/src/main/AndroidManifest.xml         | 8 +-------
 11 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2a70ff9cd1..67380f4a72 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="org.jellyfin.androidtv"
     android:installLocation="auto">
 
     <!-- Android TV Integration -->
diff --git a/playback/core/build.gradle.kts b/playback/core/build.gradle.kts
index 84c28726fd..cb2770c00f 100644
--- a/playback/core/build.gradle.kts
+++ b/playback/core/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 }
 
 android {
+	namespace = "org.jellyfin.playback.core"
 	compileSdk = 33
 
 	defaultConfig {
diff --git a/playback/core/src/main/AndroidManifest.xml b/playback/core/src/main/AndroidManifest.xml
index b739aefa5a..d7898ad6b4 100644
--- a/playback/core/src/main/AndroidManifest.xml
+++ b/playback/core/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.jellyfin.playback.core">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
 
diff --git a/playback/exoplayer/build.gradle.kts b/playback/exoplayer/build.gradle.kts
index 295195a359..31d6574491 100644
--- a/playback/exoplayer/build.gradle.kts
+++ b/playback/exoplayer/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
 }
 
 android {
+	namespace = "org.jellyfin.playback.exoplayer"
 	compileSdk = 33
 
 	defaultConfig {
diff --git a/playback/exoplayer/src/main/AndroidManifest.xml b/playback/exoplayer/src/main/AndroidManifest.xml
index e46cb39f1a..94cbbcfc39 100644
--- a/playback/exoplayer/src/main/AndroidManifest.xml
+++ b/playback/exoplayer/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.jellyfin.playback.exoplayer" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/playback/jellyfin/build.gradle.kts b/playback/jellyfin/build.gradle.kts
index 4f1d78c3b9..1d97932de6 100644
--- a/playback/jellyfin/build.gradle.kts
+++ b/playback/jellyfin/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
 }
 
 android {
+	namespace = "org.jellyfin.playback.jellyfin"
 	compileSdk = 33
 
 	defaultConfig {
diff --git a/playback/jellyfin/src/main/AndroidManifest.xml b/playback/jellyfin/src/main/AndroidManifest.xml
index 64b8e41165..94cbbcfc39 100644
--- a/playback/jellyfin/src/main/AndroidManifest.xml
+++ b/playback/jellyfin/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.jellyfin.playback.jellyfin" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/playback/ui/build.gradle.kts b/playback/ui/build.gradle.kts
index d1a21b55fa..a1a63f1095 100644
--- a/playback/ui/build.gradle.kts
+++ b/playback/ui/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
 }
 
 android {
+	namespace = "org.jellyfin.playback.ui"
 	compileSdk = 33
 
 	defaultConfig {
diff --git a/playback/ui/src/main/AndroidManifest.xml b/playback/ui/src/main/AndroidManifest.xml
index f99d2904ef..d7898ad6b4 100644
--- a/playback/ui/src/main/AndroidManifest.xml
+++ b/playback/ui/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.jellyfin.playback.ui">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application>
 
diff --git a/preference/build.gradle.kts b/preference/build.gradle.kts
index acfe337a53..2a8a6e53c0 100644
--- a/preference/build.gradle.kts
+++ b/preference/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
 }
 
 android {
+	namespace = "org.jellyfin.preference"
 	compileSdk = 33
 
 	defaultConfig {
diff --git a/preference/src/main/AndroidManifest.xml b/preference/src/main/AndroidManifest.xml
index bbce2acd88..94cbbcfc39 100644
--- a/preference/src/main/AndroidManifest.xml
+++ b/preference/src/main/AndroidManifest.xml
@@ -1,7 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.jellyfin.preference">
-
-    <application>
-
-    </application>
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />