Switch to using 'namespace' property in build.gradle

app/autodiscovery/providersxml/build.gradle

@@ -21,6 +21,8 @@ dependencies {
 }
 
 android {
+    namespace 'com.fsck.k9.autodiscovery.providersxml'
+
     compileSdkVersion buildConfig.compileSdk
     buildToolsVersion buildConfig.buildTools
 

app/autodiscovery/providersxml/src/main/AndroidManifest.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.fsck.k9.autodiscovery.providersxml" />

app/core/build.gradle

@@ -43,6 +43,8 @@ dependencies {
 }
 
 android {
+    namespace 'com.fsck.k9.core'
+
     compileSdkVersion buildConfig.compileSdk
     buildToolsVersion buildConfig.buildTools
 

app/core/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"
+    xmlns:tools="http://schemas.android.com/tools">
-    package="com.fsck.k9.core">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />

app/crypto-openpgp/build.gradle

@@ -9,6 +9,8 @@ dependencies {
 }
 
 android {
+    namespace 'com.fsck.k9.crypto.openpgp'
+
     compileSdkVersion buildConfig.compileSdk
     buildToolsVersion buildConfig.buildTools
 

app/crypto-openpgp/src/main/AndroidManifest.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.fsck.k9.crypto.openpgp" />

app/k9mail/build.gradle

@@ -41,6 +41,8 @@ dependencies {
 }
 
 android {
+    namespace 'com.fsck.k9'
+
     compileSdkVersion buildConfig.compileSdk
     buildToolsVersion buildConfig.buildTools
 

app/k9mail/src/main/AndroidManifest.xml

@@ -2,8 +2,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:installLocation="auto"
+    android:installLocation="auto">
-    package="com.fsck.k9">
 
     <uses-feature
         android:name="android.hardware.touchscreen"

app/storage/build.gradle

@@ -24,6 +24,8 @@ dependencies {
 }
 
 android {
+    namespace 'com.fsck.k9.storage'
+
     compileSdkVersion buildConfig.compileSdk
     buildToolsVersion buildConfig.buildTools
 

app/storage/src/main/AndroidManifest.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.fsck.k9.storage" />

app/testing/build.gradle

@@ -12,6 +12,8 @@ dependencies {
 }
 
 android {
+    namespace 'com.fsck.k9.testing'
+
     compileSdkVersion buildConfig.compileSdk
     buildToolsVersion buildConfig.buildTools
 

app/testing/src/main/AndroidManifest.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.fsck.k9.testing" />

app/ui/base/build.gradle

@@ -18,6 +18,8 @@ dependencies {
 }
 
 android {
+    namespace 'com.fsck.k9.ui.base'
+
     compileSdkVersion buildConfig.compileSdk
     buildToolsVersion buildConfig.buildTools
 

app/ui/base/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="com.fsck.k9.ui.base">
 
     <application>
 

app/ui/legacy/build.gradle

@@ -70,6 +70,8 @@ dependencies {
 }
 
 android {
+    namespace 'com.fsck.k9.ui'
+
     compileSdkVersion buildConfig.compileSdk
     buildToolsVersion buildConfig.buildTools
 

app/ui/legacy/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    package="com.fsck.k9.ui">
 
     <uses-permission android:name="android.permission.VIBRATE" />
 

app/ui/setup/build.gradle

@@ -27,6 +27,8 @@ dependencies {
 }
 
 android {
+    namespace 'com.fsck.k9.ui.setup'
+
     compileSdkVersion buildConfig.compileSdk
     buildToolsVersion buildConfig.buildTools
 

app/ui/setup/src/main/AndroidManifest.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.fsck.k9.ui.setup" />

plugins/openpgp-api-lib/openpgp-api/build.gradle

@@ -1,6 +1,8 @@
 apply plugin: 'com.android.library'
 
 android {
+    namespace 'org.openintents.openpgp'
+
     compileSdkVersion buildConfig.compileSdk
     buildToolsVersion buildConfig.buildTools
 

plugins/openpgp-api-lib/openpgp-api/src/main/AndroidManifest.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.openintents.openpgp">
-
-    <application/>
-
-</manifest>