From 2ea6cdc64f0541c7b28b925292e677046c7d8642 Mon Sep 17 00:00:00 2001
From: Nelson Osacky <nelson@osacky.com>
Date: Fri, 31 Mar 2017 20:18:15 -0700
Subject: [PATCH] Use try-with-resources

---
 buckw                                         |   1 +
 build.gradle                                  |   5 +++++
 .../com/uber/okbuck/core/util/FileUtil.java   |  11 ++++-------
 .../uber/okbuck/core/util/ReplaceUtil.java    |  16 ++++++----------
 gradle/wrapper/gradle-wrapper.jar             | Bin 54212 -> 54783 bytes
 gradle/wrapper/gradle-wrapper.properties      |   4 ++--
 6 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/buckw b/buckw
index d91b51fa2..ac804fb05 100755
--- a/buckw
+++ b/buckw
@@ -195,6 +195,7 @@ setupBuckRun ( ) {
 handleParams ( ) {
     # Go directly to kill. Do not run okbuck.
     if [[ "kill" == $1 ]]; then
+        echo "skipping okbuck"
         SKIP_OKBUCK=true
     fi
 }
diff --git a/build.gradle b/build.gradle
index 8a604da22..e45cb82e4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -163,6 +163,11 @@ okbuck {
     }
 }
 
+task wrapper(type : Wrapper) {
+    gradleVersion = '3.5'
+    distributionUrl = "https://services.gradle.org/distributions/gradle-3.5-all.zip"
+}
+
 gradle.buildFinished {
     "zip -d .okbuck/cache/org.hamcrest.hamcrest-core-1.3.jar LICENSE.txt".execute()
     "zip -d .okbuck/cache/org.hamcrest.hamcrest-library-1.3.jar LICENSE.txt".execute()
diff --git a/buildSrc/src/main/java/com/uber/okbuck/core/util/FileUtil.java b/buildSrc/src/main/java/com/uber/okbuck/core/util/FileUtil.java
index 3d469fcbe..c1cad5113 100644
--- a/buildSrc/src/main/java/com/uber/okbuck/core/util/FileUtil.java
+++ b/buildSrc/src/main/java/com/uber/okbuck/core/util/FileUtil.java
@@ -38,15 +38,12 @@ public static String getRelativePath(File root, File f) {
 
     @SuppressWarnings("ResultOfMethodCallIgnored")
     public static void copyResourceToProject(String resource, File destination) {
-        try {
-            InputStream inputStream = FileUtil.class.getResourceAsStream(resource);
-            destination.getParentFile().mkdirs();
-            OutputStream outputStream = new FileOutputStream(destination);
+        destination.getParentFile().mkdirs();
+        try (InputStream inputStream = FileUtil.class.getResourceAsStream(resource);
+                OutputStream outputStream = new FileOutputStream(destination)) {
             IOUtils.copy(inputStream, outputStream);
-            IOUtils.closeQuietly(inputStream);
-            IOUtils.closeQuietly(outputStream);
         } catch (IOException e) {
-            throw new IllegalStateException(e);
+            throw new RuntimeException(e);
         }
     }
 
diff --git a/buildSrc/src/main/java/com/uber/okbuck/core/util/ReplaceUtil.java b/buildSrc/src/main/java/com/uber/okbuck/core/util/ReplaceUtil.java
index e72b51409..fc1c53e03 100644
--- a/buildSrc/src/main/java/com/uber/okbuck/core/util/ReplaceUtil.java
+++ b/buildSrc/src/main/java/com/uber/okbuck/core/util/ReplaceUtil.java
@@ -18,18 +18,14 @@ final class ReplaceUtil {
 
     @SuppressWarnings("ResultOfMethodCallIgnored")
     static void copyResourceToProject(String resource, File destination, Map<String, String> templates) {
-        try {
-            InputStream inputStream = FileUtil.class.getResourceAsStream(resource);
-            destination.getParentFile().mkdirs();
-            InputStreamReader reader = new InputStreamReader(inputStream);
-            TemplateReader replacingReader = new TemplateReader(reader, new TemplateMapResolver(templates));
-
-            OutputStream outputStream = new FileOutputStream(destination);
+        destination.getParentFile().mkdirs();
+        try (InputStream inputStream = FileUtil.class.getResourceAsStream(resource);
+             InputStreamReader reader = new InputStreamReader(inputStream);
+             TemplateReader replacingReader = new TemplateReader(reader, new TemplateMapResolver(templates));
+             OutputStream outputStream = new FileOutputStream(destination)){
             IOUtils.copy(replacingReader, outputStream);
-            IOUtils.closeQuietly(inputStream);
-            IOUtils.closeQuietly(outputStream);
         } catch (IOException e) {
-            throw new IllegalStateException(e);
+            throw new RuntimeException(e);
         }
     }
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 0f0ed5820fbb731eb6b2d6d8a00055aa98c6d4be..42420ec895b3c6ebead492a56cca0d8b9bbb703e 100644
GIT binary patch
delta 6729
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

delta 6082
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0e8331a0d..9fa5fc78c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Mar 31 15:13:29 PDT 2017
+#Thu Apr 27 20:36:07 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip