Move package from manifest to namespace (#477)

AdevintaSpain · Dec 4, 2022 · 1a38cd6 · 1a38cd6
1 parent 939ce90
commit 1a38cd6
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 9 deletions.
diff --git a/barista-compose/build.gradle.kts b/barista-compose/build.gradle.kts
@@ -33,6 +33,7 @@ android {
       excludes += "/META-INF/{AL2.0,LGPL2.1}"
     }
   }
+  namespace = "com.adevinta.android.barista.compose"
 }
 
 dependencies {

diff --git a/barista-compose/src/main/AndroidManifest.xml b/barista-compose/src/main/AndroidManifest.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.adevinta.android.barista.compose"
-    >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
diff --git a/barista/build.gradle.kts b/barista/build.gradle.kts
@@ -17,6 +17,7 @@ android {
     targetSdk = 33
     testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   }
+  namespace = "com.adevinta.android.barista"
 
   lintOptions {
     disable.add("InvalidPackage")

diff --git a/barista/src/main/AndroidManifest.xml b/barista/src/main/AndroidManifest.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.adevinta.android.barista"
-    >
+    xmlns:tools="http://schemas.android.com/tools">
 
   <uses-sdk tools:overrideLibrary="android.support.test.uiautomator.v18"/>
 </manifest>
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -27,6 +27,7 @@ android {
   testOptions {
     execution = "ANDROIDX_TEST_ORCHESTRATOR"
   }
+  namespace = "com.adevinta.android.barista.sample"
 }
 
 dependencies {

diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.adevinta.android.barista.sample"
-    >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <uses-permission android:name="android.permission.READ_CONTACTS"/>
   <uses-permission android:name="android.permission.CAMERA"/>
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,6 +33,7 @@ android { @@
           excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
       }
+      namespace = "com.adevinta.android.barista.compose"
     }
     dependencies {
@@ Expand Down @@