Add an option to overwrite a mapping when uploading

README.md

@@ -19,6 +19,7 @@ If you aren't using Gradle or need more manual control, [see the API docs](https
     - [Automatic Proguard Config](#automatic-proguard-config)
     - [Custom Endpoints](#custom-endpoints)
     - [Disabling Bugsnag](#disabling-bugsnag)
+    - [Overwrite mapping file](#overwrite-mapping-file)
 - [Build UUIDs](#build-uuids)
 - [Support](#support)
 - [Contributing](#contributing)
@@ -138,6 +139,15 @@ android {
 }
 ```
 
+## Overwrite mapping file
+To overwrite a mapping file, you can set the `overwrite` property as follows:
+
+```groovy
+bugsnag {
+    overwrite false
+}
+```
+
 You can also declare this inside a product flavor. Conflicting values (between multiple flavors or a flavor and a build-type) are ignored and the plugin will be disabled if `false` was set anywhere.
 
 You may want to do this to speed up build types or flavors where you don't require Bugsnag's functionality. Bugsnag's generation of a UUID for each build into your manifest (see [Build UUIDs](#build-uuids)) causes the resources task to be run for each build, introducing a small delay if your build's changes don't involve resources.

src/main/groovy/com/bugsnag/android/gradle/BugsnagPluginExtension.groovy

@@ -6,6 +6,7 @@ package com.bugsnag.android.gradle
 class BugsnagPluginExtension {
     def String endpoint = 'https://upload.bugsnag.com'
     def String apiKey = null
-    def boolean autoUpload = true;
-    def boolean autoProguardConfig = true;
+    def boolean autoUpload = true
+    def boolean autoProguardConfig = true
+    def boolean overwrite = false
 }

src/main/groovy/com/bugsnag/android/gradle/BugsnagUploadTask.groovy

@@ -1,17 +1,15 @@
 package com.bugsnag.android.gradle
 
-import groovy.util.XmlParser
 import groovy.xml.Namespace
-
+import org.apache.http.HttpEntity
 import org.apache.http.HttpResponse
 import org.apache.http.client.HttpClient
 import org.apache.http.client.methods.HttpPost
-import org.apache.http.entity.mime.MultipartEntity
+import org.apache.http.entity.mime.MultipartEntityBuilder
 import org.apache.http.entity.mime.content.FileBody
 import org.apache.http.entity.mime.content.StringBody
 import org.apache.http.impl.client.DefaultHttpClient
 import org.apache.http.util.EntityUtils
-
 import org.gradle.api.DefaultTask
 import org.gradle.api.tasks.TaskAction
 
@@ -66,31 +64,32 @@ class BugsnagUploadTask extends DefaultTask {
         }
 
         // Upload the mapping file to Bugsnag
-        MultipartEntity mpEntity = new MultipartEntity();
-        mpEntity.addPart("proguard", new FileBody(mappingFile));
-        mpEntity.addPart("apiKey", new StringBody(apiKey));
-        mpEntity.addPart("appId", new StringBody(applicationId));
-        mpEntity.addPart("versionCode", new StringBody(versionCode));
+        MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+        builder.addPart("proguard", new FileBody(mappingFile));
+        builder.addPart("apiKey", new StringBody(apiKey));
+        builder.addPart("appId", new StringBody(applicationId));
+        builder.addPart("versionCode", new StringBody(versionCode));
 
         // Uniquely identify the build so that we can identify the proguard file.
         def buildUUID = getBuildUUID(metaDataTags, ns)
         if(buildUUID != null) {
-            mpEntity.addPart("buildUUID", new StringBody(buildUUID));
+            builder.addPart("buildUUID", new StringBody(buildUUID));
         }
 
         // Get the build version
         def versionName = xml.attributes()[ns.versionName]
         if (versionName != null) {
-            mpEntity.addPart("versionName", new StringBody(versionName));
+            builder.addPart("versionName", new StringBody(versionName));
         }
 
-        if (System.properties['bugsnag.overwrite']) {
-            mpEntity.addPart("overwrite", new StringBody("true"));
+        if (project.bugsnag.overwrite || System.properties['bugsnag.overwrite']) {
+            builder.addPart("overwrite", new StringBody("true"));
         }
+        HttpEntity entity = builder.build()
 
         // Make the request
         HttpPost httpPost = new HttpPost(project.bugsnag.endpoint)
-        httpPost.setEntity(mpEntity);
+        httpPost.setEntity(entity)
 
         HttpClient httpClient = new DefaultHttpClient();
         HttpResponse response = httpClient.execute(httpPost);