From 5cfcb9b460426c93a1c6dd3c3e2d93f703b3d7ac Mon Sep 17 00:00:00 2001
From: Leith Bade <leith@mapbox.com>
Date: Tue, 18 Nov 2014 21:34:22 +1100
Subject: [PATCH] TIdy up gradle and manifest

---
 android/java/app/build.gradle                 |  9 ++++++++-
 android/java/app/src/main/AndroidManifest.xml |  4 +---
 android/java/lib/build.gradle                 | 11 +++++++----
 android/java/lib/src/main/AndroidManifest.xml |  4 +---
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/android/java/app/build.gradle b/android/java/app/build.gradle
index 40d2fc710..c59944baf 100644
--- a/android/java/app/build.gradle
+++ b/android/java/app/build.gradle
@@ -8,11 +8,18 @@ android {
         applicationId "com.mapbox.mapboxgl.app"
         minSdkVersion 14
         targetSdkVersion 21
+        versionCode 1
+        versionName "0.1"
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
     }
 
     buildTypes {
         release {
-            runProguard false
+            runProguard true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
diff --git a/android/java/app/src/main/AndroidManifest.xml b/android/java/app/src/main/AndroidManifest.xml
index 567529187..80a39ed4b 100644
--- a/android/java/app/src/main/AndroidManifest.xml
+++ b/android/java/app/src/main/AndroidManifest.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mapbox.mapboxgl.app"
-    android:versionCode="1"
-    android:versionName="0.1" >
+    package="com.mapbox.mapboxgl.app" >
 
     <application
         android:allowBackup="false"
diff --git a/android/java/lib/build.gradle b/android/java/lib/build.gradle
index 6ba0bb574..1700dd6c8 100644
--- a/android/java/lib/build.gradle
+++ b/android/java/lib/build.gradle
@@ -8,10 +8,13 @@ android {
         applicationId "com.mapbox.mapboxgl.lib"
         minSdkVersion 14
         targetSdkVersion 21
+        versionCode 1
+        versionName "0.1"
+    }
 
-        ndk {
-            moduleName "NativeMapView"
-        }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
     }
 
     buildTypes {
@@ -20,7 +23,7 @@ android {
         }
 
         release {
-            runProguard false
+            runProguard true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
diff --git a/android/java/lib/src/main/AndroidManifest.xml b/android/java/lib/src/main/AndroidManifest.xml
index d23d386f9..22b0afbc3 100644
--- a/android/java/lib/src/main/AndroidManifest.xml
+++ b/android/java/lib/src/main/AndroidManifest.xml
@@ -1,7 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mapbox.mapboxgl.lib"
-    android:versionCode="1"
-    android:versionName="0.1" >
+    package="com.mapbox.mapboxgl.lib" >
     
     <uses-feature android:glEsVersion="0x00020000" android:required="true" />