Migrate from manifest to build script module namespace (#2380)

square · May 26, 2023 · e9f2e5e · e9f2e5e
1 parent 5e82445
commit e9f2e5e
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 8 deletions.
diff --git a/picasso-compose/build.gradle b/picasso-compose/build.gradle
@@ -3,6 +3,8 @@ apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'com.vanniktech.maven.publish'
 
 android {
+  namespace 'com.squareup.picasso3.compose'
+
   compileSdkVersion versions.compileSdk
 
   defaultConfig {

diff --git a/picasso-compose/src/main/AndroidManifest.xml b/picasso-compose/src/main/AndroidManifest.xml
diff --git a/picasso-pollexor/build.gradle b/picasso-pollexor/build.gradle
@@ -3,6 +3,8 @@ apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'com.vanniktech.maven.publish'
 
 android {
+  namespace 'com.squareup.picasso3.pollexor'
+
   compileSdkVersion versions.compileSdk
 
   defaultConfig {

diff --git a/picasso-pollexor/src/main/AndroidManifest.xml b/picasso-pollexor/src/main/AndroidManifest.xml
diff --git a/picasso-sample/build.gradle b/picasso-sample/build.gradle
@@ -2,6 +2,8 @@ apply plugin: 'com.android.application'
 apply plugin: 'org.jetbrains.kotlin.android'
 
 android {
+  namespace 'com.example.picasso'
+
   compileSdkVersion versions.compileSdk
 
   defaultConfig {

diff --git a/picasso-sample/src/main/AndroidManifest.xml b/picasso-sample/src/main/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.example.picasso">
+    xmlns:tools="http://schemas.android.com/tools">
 
   <!-- This is required for Picasso to work. -->
   <uses-permission android:name="android.permission.INTERNET"/>

diff --git a/picasso-stats/build.gradle b/picasso-stats/build.gradle
@@ -3,6 +3,8 @@ apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'com.vanniktech.maven.publish'
 
 android {
+  namespace 'com.squareup.picasso3.stats'
+
   compileSdkVersion versions.compileSdk
 
   defaultConfig {

diff --git a/picasso-stats/src/main/AndroidManifest.xml b/picasso-stats/src/main/AndroidManifest.xml
diff --git a/picasso/build.gradle b/picasso/build.gradle
@@ -3,6 +3,8 @@ apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'com.vanniktech.maven.publish'
 
 android {
+  namespace 'com.squareup.picasso3'
+
   compileSdkVersion versions.compileSdk
 
   defaultConfig {

diff --git a/picasso/src/androidTest/AndroidManifest.xml b/picasso/src/androidTest/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.squareup.picasso3">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 

diff --git a/picasso/src/main/AndroidManifest.xml b/picasso/src/main/AndroidManifest.xml