Migrate namespaces in gradle files

application/app/build.gradle

@@ -118,6 +118,7 @@ android {
         abortOnError false
         disable 'MissingTranslation', 'ExtraTranslation'
     }
+    namespace 'org.videolan.mobile.app'
     // make per-variant version code
     applicationVariants.all { variant ->
         //Custom APK name and versionCode

application/app/src/androidTest/AndroidManifest.xml

@@ -22,9 +22,7 @@
   ~
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        package="org.videolan.mobile.app">
+<manifest xmlns:tools="http://schemas.android.com/tools">
 
     <uses-sdk tools:overrideLibrary="android_libs.ub_uiautomator, tools.fastlane.screengrab" />
 </manifest>

application/app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="org.videolan.mobile.app"
-    android:installLocation="auto">
+        android:installLocation="auto">
 
     <application
         android:name=".VLCApplication"

application/donations/build.gradle

@@ -61,6 +61,7 @@ android {
             matchingFallbacks = ['debug']
         }
     }
+    namespace 'org.videolan.vlc.donations'
 }
 
 static def getPublicApiKey(project) {

application/donations/src/main/AndroidManifest.xml

@@ -22,8 +22,7 @@
   ~
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="org.videolan.vlc.donations">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="com.android.vending.BILLING" />
 
     <application/>

application/live-plot-graph/build.gradle

@@ -41,6 +41,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'org.videolan.liveplotgraph'
 
 }
 

application/live-plot-graph/src/main/AndroidManifest.xml

@@ -22,5 +22,4 @@
   ~
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="org.videolan.liveplotgraph" />
+<manifest />

application/mediadb/build.gradle

@@ -54,6 +54,7 @@ android {
             matchingFallbacks = ['debug']
         }
     }
+    namespace 'org.videolan.vlc.mediadb'
 
 }
 

application/mediadb/src/main/AndroidManifest.xml

@@ -22,5 +22,4 @@
   ~
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="org.videolan.vlc.mediadb" />
+<manifest />

application/moviepedia/build.gradle

@@ -41,6 +41,7 @@ android {
             matchingFallbacks = ['debug']
         }
     }
+    namespace 'org.videolan.moviepedia'
 
 }
 

application/moviepedia/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.videolan.moviepedia" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 <application>
     <activity
             android:name="org.videolan.moviepedia.ui.MediaScrapingActivity"

application/resources/build.gradle

@@ -41,6 +41,7 @@ android {
     sourceSets.dev {
         res.srcDirs = ['flavors/debug/res']
     }
+    namespace 'org.videolan.resources'
 
 }
 dependencies {

application/resources/src/main/AndroidManifest.xml

@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
-package="org.videolan.resources" >
+<manifest>
 </manifest>

application/television/build.gradle

@@ -34,6 +34,7 @@ android {
             matchingFallbacks = ['debug']
         }
     }
+    namespace 'org.videolan.television'
 
 }
 

application/television/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="org.videolan.television">
+    xmlns:tools="http://schemas.android.com/tools">
     <application>
         <activity
             android:name="org.videolan.television.ui.MainTvActivity"

application/tools/build.gradle

@@ -20,6 +20,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'videolan.org.commontools'
 }
 
 dependencies {

application/tools/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="videolan.org.commontools"
-    xmlns:tools="http://schemas.android.com/tools">
+<manifest xmlns:tools="http://schemas.android.com/tools">
 
     <uses-sdk
         tools:overrideLibrary="android.support.media.tv,androidx.tvprovider" />

application/vlc-android/build.gradle

@@ -110,6 +110,7 @@ android {
         assets.srcDirs = ['flavors/debug/assets']
         assets.srcDirs += files("$projectDir/assets/schemas".toString())
     }
+    namespace 'org.videolan.vlc'
 }
 
 def generateTranslation() {

application/vlc-android/src/debug/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.videolan.vlc"
         android:installLocation="auto">
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

extension-api/build.gradle

@@ -45,6 +45,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'org.videolan.vlc.plugin.api'
 }
 
 dependencies {

extension-api/src/main/AndroidManifest.xml

@@ -21,8 +21,7 @@
   ~  ***************************************************************************
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.videolan.vlc.plugin.api">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application 
         android:supportsRtl="true">