make the code compatible with guava_17

1 files changed, 12 insertions, 7 deletions

diff --git a/android-gradle-jps/src/com/android/tools/idea/jps/builder/AndroidGradleTargetBuilder.java b/android-gradle-jps/src/com/android/tools/idea/jps/builder/AndroidGradleTargetBuilder.java
index 1bd496926a1..2c30bbb830d 100644
--- a/android-gradle-jps/src/com/android/tools/idea/jps/builder/AndroidGradleTargetBuilder.java
+++ b/android-gradle-jps/src/com/android/tools/idea/jps/builder/AndroidGradleTargetBuilder.java
@@ -20,7 +20,7 @@ import com.android.tools.idea.gradle.output.parser.GradleErrorOutputParser;
 import com.android.tools.idea.gradle.util.AndroidGradleSettings;
 import com.android.tools.idea.gradle.util.BuildMode;
 import com.android.tools.idea.gradle.util.GradleBuilds;
-import com.android.tools.idea.gradle.util.GradleBuilds.TestCompileType;
+import com.android.tools.idea.gradle.util.GradleBuilds.*;
 import com.android.tools.idea.jps.AndroidGradleJps;
 import com.android.tools.idea.jps.model.JpsAndroidGradleModuleExtension;
 import com.google.common.base.Strings;
@@ -64,12 +64,13 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import static com.android.tools.idea.gradle.util.GradleBuilds.CONFIGURE_ON_DEMAND_OPTION;
-import static com.android.tools.idea.gradle.util.GradleBuilds.OFFLINE_MODE_OPTION;
-import static com.android.tools.idea.gradle.util.GradleBuilds.PARALLEL_BUILD_OPTION;
+import static com.android.tools.idea.gradle.util.GradleBuilds.*;
 
 /**
  * Builds Gradle-based Android project using Gradle.
@@ -353,8 +354,12 @@ public class AndroidGradleTargetBuilder extends TargetBuilder<AndroidGradleBuild
     finally {
       String outText = stdout.toString();
       context.processMessage(new ProgressMessage(outText, 1.0f));
-      Closeables.closeQuietly(stdout);
-      Closeables.closeQuietly(stderr);
+      try {
+        Closeables.close(stdout, true);
+        Closeables.close(stderr, true);
+      } catch (IOException e) {
+        LOG.debug(e);
+      }
       connection.close();
     }
   }