Close IO streams after the plugin has finished reading and writing

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 3.X.X (TBD)
+
+### Bug fixes
+
+* Close IO streams after the plugin has finished reading and writing
+[Jamie Lynch](https://github.com/fractalwrench) [#126](https://github.com/bugsnag/bugsnag-android-gradle-plugin/pull/126)
+
 ## 3.4.0 (2018-08-30)
 
 * Compress Android NDK mapping files to decrease upload times

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

@@ -51,10 +51,20 @@ class BugsnagManifestTask extends BugsnagVariantOutputTask {
             application.appendNode('meta-data', [(ns.name): BugsnagPlugin.BUILD_UUID_TAG, (ns.value): buildUUID])
 
             // Write the manifest file
-            def writer = new FileWriter(manifestPath)
-            def printer = new XmlNodePrinter(new PrintWriter(writer))
-            printer.preserveWhitespace = true
-            printer.print(xml)
+            FileWriter writer = null
+
+            try {
+                writer = new FileWriter(manifestPath)
+                def printer = new XmlNodePrinter(new PrintWriter(writer))
+                printer.preserveWhitespace = true
+                printer.print(xml)
+            } catch (Exception e) {
+                project.logger.warn("Failed to update manifest with Bugsnag metadata", e)
+            } finally {
+                if (writer != null) {
+                    writer.close()
+                }
+            }
         } else {
             project.logger.error("Bugsnag detected invalid manifest with no application element so did not write Build UUID")
         }

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

@@ -41,10 +41,19 @@ class BugsnagProguardConfigTask extends DefaultTask {
         file.getParentFile().mkdirs()
 
         // Write our recommended proguard settings to this file
-        FileWriter fr = new FileWriter(file.path)
-        fr.write(PROGUARD_CONFIG_SETTINGS)
-        fr.write("\n")
-        fr.close()
+        FileWriter fr = null
+
+        try {
+            fr = new FileWriter(file.path)
+            fr.write(PROGUARD_CONFIG_SETTINGS)
+            fr.write("\n")
+        } catch (Exception e) {
+            project.logger.warn("Failed to write Bugsnag ProGuard settings", e)
+        } finally {
+            if (fr != null) {
+                fr.close()
+            }
+        }
 
         // Add this proguard settings file to the list
         variant.getBuildType().buildType.proguardFiles(file)

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

@@ -48,6 +48,8 @@ class BugsnagReleasesTask extends BugsnagVariantOutputTask {
     }
 
     private boolean deliverPayload(JSONObject payload) {
+        OutputStream os = null
+
         try {
             URL url = new URL(project.bugsnag.releasesEndpoint)
             HttpURLConnection conn = url.openConnection()
@@ -58,31 +60,40 @@ class BugsnagReleasesTask extends BugsnagVariantOutputTask {
             conn.setConnectTimeout(Call.TIMEOUT_MILLIS)
             conn.setDoOutput(true)
 
-            OutputStream os = conn.outputStream
+            os = conn.outputStream
             os.write(payload.toString().getBytes("UTF-8"))
-            os.close()
 
             int statusCode = conn.getResponseCode()
 
             if (statusCode == 200) {
                 project.logger.info("Uploaded release info to Bugsnag")
                 return true
             } else {
-                BufferedReader reader = new BufferedReader(new InputStreamReader(conn.errorStream))
+                BufferedReader reader
                 String line
 
-                while ((line = reader.readLine()) != null) {
-                    project.logger.error(line)
+                try {
+                    reader = new BufferedReader(new InputStreamReader(conn.errorStream))
+                    while ((line = reader.readLine()) != null) {
+                        project.logger.error(line)
+                    }
+                    project.logger.warn("Release Request failed with statusCode " + statusCode)
+                } finally {
+                    if (reader != null) {
+                        reader.close()
+                    }
                 }
-
-                project.logger.warn("Release Request failed with statusCode " + statusCode)
                 return false
             }
 
         } catch (IOException e) {
             project.logger.error(project.bugsnag.releasesEndpoint)
             project.logger.error("Failed to POST request", e)
             return false
+        } finally {
+            if (os != null) {
+                os.close()
+            }
         }
     }
 

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

@@ -10,8 +10,6 @@ import org.apache.http.entity.mime.content.FileBody
 import org.apache.http.entity.mime.content.StringBody
 import org.gradle.api.tasks.TaskAction
 
-import java.util.regex.Matcher
-import java.util.regex.Pattern
 import java.util.zip.GZIPOutputStream
 
 import static groovy.io.FileType.FILES
@@ -116,6 +114,8 @@ class BugsnagUploadNdkTask extends BugsnagMultiPartUploadTask {
         File objDumpPath = getObjDumpExecutable(arch)
         if (objDumpPath != null) {
 
+            Reader outReader = null
+
             try {
                 File outputDir = new File(project.buildDir, "bugsnag")
 
@@ -144,6 +144,10 @@ class BugsnagUploadNdkTask extends BugsnagMultiPartUploadTask {
                 }
             } catch (Exception e) {
                 project.logger.error("failed to generate symbols for " + arch + ": " + e.getMessage(), e)
+            } finally {
+                if (outReader != null) {
+                    outReader.close()
+                }
             }
         } else {
             project.logger.error("Unable to upload NDK symbols: Could not find objdump location for " + arch)