Move things from the AndroidManifest.xml to build.gradle

k9mail/build.gradle

@@ -43,6 +43,12 @@ android {
     buildToolsVersion rootProject.buildToolsVersion
 
     defaultConfig {
+        applicationId "com.fsck.k9"
+        testApplicationId "com.fsck.k9.tests"
+
+        versionCode 23060
+        versionName '5.106'
+
         minSdkVersion 15
         targetSdkVersion 22
 

k9mail/src/androidTest/AndroidManifest.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.fsck.k9.tests"
-          android:versionCode="1"
-          android:versionName="1.0">
-    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="17"/>
-
-    <!-- Allow debug trace to be written -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-    <!-- We add an application tag here just so that we can indicate that
-         this package needs to link against the android.test library,
-         which is needed when building test cases. -->
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-</manifest>

k9mail/src/main/AndroidManifest.xml

@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
-    package="com.fsck.k9"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="23060"
-    android:versionName="5.106">
+    package="com.fsck.k9">
 
     <uses-feature
         android:name="android.hardware.touchscreen"