[Android] Migrate namespaces in gradle files
Nicolas Pomepuy
git at videolan.org
Wed May 25 09:01:59 UTC 2022
vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Tue May 24 15:00:30 2022 +0200| [5ab549d09f3da659ecaa77ebb7ae7db660ec4a56] | committer: Nicolas Pomepuy
Migrate namespaces in gradle files
> https://code.videolan.org/videolan/vlc-android/commit/5ab549d09f3da659ecaa77ebb7ae7db660ec4a56
---
application/app/build.gradle | 1 +
application/app/src/androidTest/AndroidManifest.xml | 4 +---
application/app/src/main/AndroidManifest.xml | 3 +--
application/donations/build.gradle | 1 +
application/donations/src/main/AndroidManifest.xml | 3 +--
application/live-plot-graph/build.gradle | 1 +
application/live-plot-graph/src/main/AndroidManifest.xml | 3 +--
application/mediadb/build.gradle | 1 +
application/mediadb/src/main/AndroidManifest.xml | 3 +--
application/moviepedia/build.gradle | 1 +
application/moviepedia/src/main/AndroidManifest.xml | 3 +--
application/resources/build.gradle | 1 +
application/resources/src/main/AndroidManifest.xml | 3 +--
application/television/build.gradle | 1 +
application/television/src/main/AndroidManifest.xml | 3 +--
application/tools/build.gradle | 1 +
application/tools/src/main/AndroidManifest.xml | 3 +--
application/vlc-android/build.gradle | 1 +
application/vlc-android/src/debug/AndroidManifest.xml | 1 -
extension-api/build.gradle | 1 +
extension-api/src/main/AndroidManifest.xml | 3 +--
21 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/application/app/build.gradle b/application/app/build.gradle
index b7ca6b04e..f578e62ed 100644
--- a/application/app/build.gradle
+++ b/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
diff --git a/application/app/src/androidTest/AndroidManifest.xml b/application/app/src/androidTest/AndroidManifest.xml
index f436f147a..92853ef48 100644
--- a/application/app/src/androidTest/AndroidManifest.xml
+++ b/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>
\ No newline at end of file
diff --git a/application/app/src/main/AndroidManifest.xml b/application/app/src/main/AndroidManifest.xml
index 6f9d4ebda..94dcbda64 100644
--- a/application/app/src/main/AndroidManifest.xml
+++ b/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"
diff --git a/application/donations/build.gradle b/application/donations/build.gradle
index 71a3954d7..a50aec063 100644
--- a/application/donations/build.gradle
+++ b/application/donations/build.gradle
@@ -61,6 +61,7 @@ android {
matchingFallbacks = ['debug']
}
}
+ namespace 'org.videolan.vlc.donations'
}
static def getPublicApiKey(project) {
diff --git a/application/donations/src/main/AndroidManifest.xml b/application/donations/src/main/AndroidManifest.xml
index 4f7bf3f76..c989910ce 100644
--- a/application/donations/src/main/AndroidManifest.xml
+++ b/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/>
diff --git a/application/live-plot-graph/build.gradle b/application/live-plot-graph/build.gradle
index ecf208d46..407717a93 100644
--- a/application/live-plot-graph/build.gradle
+++ b/application/live-plot-graph/build.gradle
@@ -41,6 +41,7 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
+ namespace 'org.videolan.liveplotgraph'
}
diff --git a/application/live-plot-graph/src/main/AndroidManifest.xml b/application/live-plot-graph/src/main/AndroidManifest.xml
index e1e8c0937..bd5c5f73d 100644
--- a/application/live-plot-graph/src/main/AndroidManifest.xml
+++ b/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 />
diff --git a/application/mediadb/build.gradle b/application/mediadb/build.gradle
index e47b1caf0..61c64912b 100644
--- a/application/mediadb/build.gradle
+++ b/application/mediadb/build.gradle
@@ -54,6 +54,7 @@ android {
matchingFallbacks = ['debug']
}
}
+ namespace 'org.videolan.vlc.mediadb'
}
diff --git a/application/mediadb/src/main/AndroidManifest.xml b/application/mediadb/src/main/AndroidManifest.xml
index 789fe0609..bd5c5f73d 100644
--- a/application/mediadb/src/main/AndroidManifest.xml
+++ b/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 />
diff --git a/application/moviepedia/build.gradle b/application/moviepedia/build.gradle
index 9fdbaf74e..a59963df2 100644
--- a/application/moviepedia/build.gradle
+++ b/application/moviepedia/build.gradle
@@ -41,6 +41,7 @@ android {
matchingFallbacks = ['debug']
}
}
+ namespace 'org.videolan.moviepedia'
}
diff --git a/application/moviepedia/src/main/AndroidManifest.xml b/application/moviepedia/src/main/AndroidManifest.xml
index 168e1a6be..4b495fd32 100644
--- a/application/moviepedia/src/main/AndroidManifest.xml
+++ b/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"
diff --git a/application/resources/build.gradle b/application/resources/build.gradle
index c934800f7..e83248ac7 100644
--- a/application/resources/build.gradle
+++ b/application/resources/build.gradle
@@ -41,6 +41,7 @@ android {
sourceSets.dev {
res.srcDirs = ['flavors/debug/res']
}
+ namespace 'org.videolan.resources'
}
dependencies {
diff --git a/application/resources/src/main/AndroidManifest.xml b/application/resources/src/main/AndroidManifest.xml
index aaf870920..69fc41290 100644
--- a/application/resources/src/main/AndroidManifest.xml
+++ b/application/resources/src/main/AndroidManifest.xml
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest
-package="org.videolan.resources" >
+<manifest>
</manifest>
\ No newline at end of file
diff --git a/application/television/build.gradle b/application/television/build.gradle
index f3c696851..cf2ece20d 100644
--- a/application/television/build.gradle
+++ b/application/television/build.gradle
@@ -34,6 +34,7 @@ android {
matchingFallbacks = ['debug']
}
}
+ namespace 'org.videolan.television'
}
diff --git a/application/television/src/main/AndroidManifest.xml b/application/television/src/main/AndroidManifest.xml
index e38d293e6..6ab9f328f 100644
--- a/application/television/src/main/AndroidManifest.xml
+++ b/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"
diff --git a/application/tools/build.gradle b/application/tools/build.gradle
index 1c425fd23..bf01bfc6f 100644
--- a/application/tools/build.gradle
+++ b/application/tools/build.gradle
@@ -20,6 +20,7 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
+ namespace 'videolan.org.commontools'
}
dependencies {
diff --git a/application/tools/src/main/AndroidManifest.xml b/application/tools/src/main/AndroidManifest.xml
index 987191043..f1e1e1af3 100644
--- a/application/tools/src/main/AndroidManifest.xml
+++ b/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" />
diff --git a/application/vlc-android/build.gradle b/application/vlc-android/build.gradle
index 24103fc78..a709031cb 100644
--- a/application/vlc-android/build.gradle
+++ b/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() {
diff --git a/application/vlc-android/src/debug/AndroidManifest.xml b/application/vlc-android/src/debug/AndroidManifest.xml
index 30c4fdf37..b113d1823 100644
--- a/application/vlc-android/src/debug/AndroidManifest.xml
+++ b/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" />
diff --git a/extension-api/build.gradle b/extension-api/build.gradle
index e866d86b6..8d1ce8706 100644
--- a/extension-api/build.gradle
+++ b/extension-api/build.gradle
@@ -45,6 +45,7 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
+ namespace 'org.videolan.vlc.plugin.api'
}
dependencies {
diff --git a/extension-api/src/main/AndroidManifest.xml b/extension-api/src/main/AndroidManifest.xml
index addda712b..0603ac48f 100644
--- a/extension-api/src/main/AndroidManifest.xml
+++ b/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">
More information about the Android
mailing list