Move the package namespace declarations from manifest to gradle files

woocommerce · Mar 11, 2023 · e954703 · e954703
1 parent 2ee0173
commit e954703
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 9 deletions.
diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle
@@ -66,6 +66,8 @@ repositories {
 }
 
 android {
+    namespace "com.woocommerce.android"
+
     compileSdkVersion gradle.ext.compileSdkVersion
 
     defaultConfig {

diff --git a/WooCommerce/src/debug/AndroidManifest.xml b/WooCommerce/src/debug/AndroidManifest.xml
@@ -1,8 +1,7 @@
 <?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="com.woocommerce.android">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Allows unlocking your device and activating its screen so UI tests can succeed -->
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />

diff --git a/WooCommerce/src/main/AndroidManifest.xml b/WooCommerce/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="com.woocommerce.android">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Mark the camera as optional, as the back camera is missing from some ChromeOS devices -->
     <uses-feature

diff --git a/libs/cardreader/build.gradle b/libs/cardreader/build.gradle
@@ -5,6 +5,8 @@ plugins {
 }
 
 android {
+    namespace "com.woocommerce.android.cardreader"
+
     compileSdkVersion gradle.ext.compileSdkVersion
 
     defaultConfig {

diff --git a/libs/cardreader/src/main/AndroidManifest.xml b/libs/cardreader/src/main/AndroidManifest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.woocommerce.android.cardreader">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
     <uses-permission
         android:name="android.permission.BLUETOOTH"

diff --git a/libs/iap/build.gradle b/libs/iap/build.gradle
@@ -4,6 +4,8 @@ plugins {
 }
 
 android {
+    namespace "com.woocommerce.android.iap"
+
     compileSdkVersion gradle.ext.compileSdkVersion
 
     defaultConfig {

diff --git a/libs/iap/src/main/AndroidManifest.xml b/libs/iap/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.woocommerce.android.iap"/>
+<manifest />
diff --git a/quicklogin/build.gradle b/quicklogin/build.gradle
@@ -47,6 +47,8 @@ repositories {
 }
 
 android {
+    namespace "com.woocommerce.android.quicklogin"
+
     compileSdkVersion gradle.ext.compileSdkVersion
 
     defaultConfig {

diff --git a/quicklogin/src/main/AndroidManifest.xml b/quicklogin/src/main/AndroidManifest.xml
@@ -1,3 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.woocommerce.android.quicklogin">
-</manifest>
+<manifest />