Remove usages of Throwables to fix deprecation warnings

LexManos · LexManos · commit def00039474d · 2018-03-23T20:40:22.000-07:00
diff --git a/src/main/java/net/minecraftforge/gradle/common/BasePlugin.java b/src/main/java/net/minecraftforge/gradle/common/BasePlugin.java
@@ -28,7 +28,6 @@
 import java.lang.reflect.Type;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -446,9 +445,9 @@ public Boolean call()
                             Files.write(buf.toString().getBytes(Charsets.UTF_8), delayedFile("jsons/" + Constants.REPLACE_MC_VERSION + ".json").call());
                         }
                     }
-                    catch (Throwable t)
+                    catch (IOException e)
                     {
-                        Throwables.propagate(t);
+                        throw new RuntimeException(e);
                     }
                     return true;
                 }
@@ -772,7 +771,7 @@ else if (con.getResponseCode() == 200)
             }
             catch (IOException e)
             {
-                Throwables.propagate(e);
+                throw new RuntimeException(e);
             }
         }
 
@@ -801,10 +800,10 @@ protected Version parseAndStoreVersion(File file, File... inheritanceDirs)
             {
                 version = JsonFactory.loadVersion(file, delayedString(REPLACE_MC_VERSION).call(), inheritanceDirs);
             }
-            catch (Exception e)
+            catch (IOException e)
             {
                 LOGGER.error("" + file + " could not be parsed");
-                Throwables.propagate(e);
+                throw new RuntimeException(e);
             }
         }
 
diff --git a/src/main/java/net/minecraftforge/gradle/patcher/TaskExtractExcModifiers.java b/src/main/java/net/minecraftforge/gradle/patcher/TaskExtractExcModifiers.java
@@ -36,15 +36,14 @@
 import org.objectweb.asm.Opcodes;
 
 import com.google.common.base.Charsets;
-import com.google.common.base.Throwables;
 import com.google.common.io.ByteStreams;
 import com.google.common.io.Files;
 
 class TaskExtractExcModifiers extends DefaultTask
 {
     @InputFile
     private Object inJar;
-    
+
     @OutputFile
     private Object outExc;
 
@@ -53,11 +52,11 @@ class TaskExtractExcModifiers extends DefaultTask
      * Default is for minecraft
      */
     String matchingPrefix = "net/minecraft/";
-    
+
     //@formatter:off
     public TaskExtractExcModifiers() { super(); }
     //@formatter:on
-    
+
     @TaskAction
     public void doStuff() throws IOException
     {
@@ -69,7 +68,7 @@ public void doStuff() throws IOException
 
         output.getParentFile().mkdirs();
         output.createNewFile();
-        
+
         try (BufferedWriter writer = Files.newWriter(output, Charsets.UTF_8);
             ZipInputStream zin = new ZipInputStream(new FileInputStream(input)))
         {
@@ -94,7 +93,7 @@ public void doStuff() throws IOException
             }
         }
     }
-    
+
     private static class GenerateMapClassAdapter extends ClassVisitor
     {
         String className;
@@ -132,7 +131,7 @@ public MethodVisitor visitMethod(int access, String name, String desc, String si
             }
             catch (IOException e)
             {
-                Throwables.propagate(e);
+                throw new RuntimeException(e);
             }
             return super.visitMethod(access, name, desc, signature, exceptions);
         }
diff --git a/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java b/src/main/java/net/minecraftforge/gradle/tasks/ApplyS2STask.java
@@ -45,7 +45,6 @@
 import com.google.common.base.Charsets;
 import com.google.common.base.Joiner;
 import com.google.common.base.Strings;
-import com.google.common.base.Throwables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.io.Files;
@@ -287,10 +286,8 @@ private FileCollection generateDefaultExc(File modifiers, FileCollection current
         }
         catch (IOException e)
         {
-            Throwables.propagate(e);
+            throw new RuntimeException(e);
         }
-
-        return null;
     }
 
     @InputFiles @SkipWhenEmpty
diff --git a/src/main/java/net/minecraftforge/gradle/tasks/CreateStartTask.java b/src/main/java/net/minecraftforge/gradle/tasks/CreateStartTask.java
@@ -30,6 +30,7 @@
 import java.util.Set;
 
 import net.minecraftforge.gradle.common.Constants;
+import net.minecraftforge.gradle.util.ThrowableUtil;
 import net.minecraftforge.gradle.util.caching.Cached;
 import net.minecraftforge.gradle.util.caching.CachedTask;
 
@@ -206,10 +207,9 @@ private String getResource(URL resource)
         {
             return Resources.toString(resource, Charsets.UTF_8);
         }
-        catch (Exception e)
+        catch (IOException e)
         {
-            Throwables.propagate(e);
-            return "";
+            throw new RuntimeException(e);
         }
     }
 
diff --git a/src/main/java/net/minecraftforge/gradle/tasks/CrowdinDownload.java b/src/main/java/net/minecraftforge/gradle/tasks/CrowdinDownload.java
@@ -43,7 +43,6 @@
 import com.google.common.base.Charsets;
 import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
-import com.google.common.base.Throwables;
 import com.google.common.collect.Iterables;
 import com.google.common.io.CharStreams;
 import com.google.common.io.Files;
@@ -118,10 +117,10 @@ private void exportLocalizations(String projectId, String key) throws IOExceptio
         {
             con.connect();
         }
-        catch (Throwable e)
+        catch (IOException e)
         {
             // just in case people dont have internet at the moment.
-            Throwables.propagate(e);
+            throw new RuntimeException(e);
         }
 
         int reponse = con.getResponseCode();
diff --git a/src/main/java/net/minecraftforge/gradle/tasks/PatchSourcesTask.java b/src/main/java/net/minecraftforge/gradle/tasks/PatchSourcesTask.java
@@ -29,6 +29,7 @@
 
 import net.minecraftforge.gradle.common.Constants;
 import net.minecraftforge.gradle.util.GradleConfigurationException;
+import net.minecraftforge.gradle.util.ThrowableUtil;
 import net.minecraftforge.gradle.util.patching.ContextualPatch;
 import net.minecraftforge.gradle.util.patching.ContextualPatch.PatchStatus;
 
@@ -45,7 +46,6 @@
 import com.cloudbees.diff.PatchException;
 import com.google.common.base.Charsets;
 import com.google.common.base.Joiner;
-import com.google.common.base.Throwables;
 import com.google.common.collect.Lists;
 import com.google.common.io.Files;
 
@@ -291,7 +291,7 @@ else if (report.getStatus() == ContextualPatch.PatchStatus.Fuzzed)
 
         if (failure != null && failOnError)
         {
-            Throwables.propagate(failure);
+            ThrowableUtil.propagate(failure);
         }
 
         if (fuzzed)
diff --git a/src/main/java/net/minecraftforge/gradle/tasks/PostDecompileTask.java b/src/main/java/net/minecraftforge/gradle/tasks/PostDecompileTask.java
@@ -34,6 +34,7 @@
 import java.util.zip.ZipEntry;
 
 import net.minecraftforge.gradle.common.Constants;
+import net.minecraftforge.gradle.util.ThrowableUtil;
 import net.minecraftforge.gradle.util.caching.Cached;
 import net.minecraftforge.gradle.util.delayed.DelayedFile;
 import net.minecraftforge.gradle.util.mcp.FFPatcher;
@@ -55,7 +56,6 @@
 import com.github.abrarsyed.jastyle.OptParser;
 import com.google.common.base.Charsets;
 import com.google.common.base.Joiner;
-import com.google.common.base.Throwables;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
@@ -251,7 +251,7 @@ else if (report.getStatus() == PatchStatus.Fuzzed) // catch fuzzed patches
         if (fuzzed)
             getLogger().lifecycle("Patches Fuzzed!");
         if (error != null) {
-            Throwables.propagate(error);
+            ThrowableUtil.propagate(error);
         }
     }
 
diff --git a/src/main/java/net/minecraftforge/gradle/tasks/SplitJarTask.java b/src/main/java/net/minecraftforge/gradle/tasks/SplitJarTask.java
@@ -42,8 +42,6 @@
 import org.gradle.api.tasks.util.PatternFilterable;
 import org.gradle.api.tasks.util.PatternSet;
 
-import com.google.common.base.Throwables;
-
 public class SplitJarTask extends CachedTask implements PatternFilterable
 {
     @InputFile
@@ -111,7 +109,7 @@ public void visitFile(FileVisitDetails details)
                     }
                     catch (IOException e)
                     {
-                        Throwables.propagate(e);
+                        throw new RuntimeException(e);
                     }
                 }
             });
diff --git a/src/main/java/net/minecraftforge/gradle/user/TaskRecompileMc.java b/src/main/java/net/minecraftforge/gradle/user/TaskRecompileMc.java
@@ -42,7 +42,6 @@
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
 
-import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Sets;
 import com.google.common.io.Files;
@@ -191,7 +190,7 @@ public void visitDir(FileVisitDetails dir)
             }
             catch (IOException e)
             {
-                Throwables.propagate(e);
+                throw new RuntimeException(e);
             }
         }
 
@@ -212,7 +211,7 @@ public void visitFile(FileVisitDetails file)
             }
             catch (IOException e)
             {
-                Throwables.propagate(e);
+                throw new RuntimeException(e);
             }
         }
     }
diff --git a/src/main/java/net/minecraftforge/gradle/user/patcherUser/TaskApplyBinPatches.java b/src/main/java/net/minecraftforge/gradle/user/patcherUser/TaskApplyBinPatches.java
@@ -26,7 +26,6 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.nio.file.*;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -48,7 +47,6 @@
 import org.gradle.api.tasks.TaskAction;
 
 import com.google.common.base.Joiner;
-import com.google.common.base.Throwables;
 import com.google.common.collect.Maps;
 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteStreams;
@@ -168,7 +166,7 @@ public void visitFile(FileVisitDetails file)
                     }
                     catch (IOException e)
                     {
-                        throw Throwables.propagate(e);
+                        throw new RuntimeException(e);
                     }
                 }
 
@@ -197,9 +195,9 @@ public void setup()
             }
             bytes = jarBytes.toByteArray();
         }
-        catch (Exception e)
+        catch (IOException e)
         {
-            throw Throwables.propagate(e);
+            throw new RuntimeException(e);
         }
 
         log("Reading Patches:");
@@ -223,7 +221,7 @@ public void setup()
         }
         catch (IOException e)
         {
-            throw Throwables.propagate(e);
+            throw new RuntimeException(e);
         }
         log("Read %d binary patches", patchlist.size());
         log("Patch list :\n\t%s", Joiner.on("\n\t").join(patchlist.entrySet()));
diff --git a/src/main/java/net/minecraftforge/gradle/util/ThrowableUtil.java b/src/main/java/net/minecraftforge/gradle/util/ThrowableUtil.java
@@ -0,0 +1,32 @@
+/*
+ * A Gradle plugin for the creation of Minecraft mods and MinecraftForge plugins.
+ * Copyright (C) 2013-2018 Minecraft Forge
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
+ */
+package net.minecraftforge.gradle.util;
+
+public class ThrowableUtil
+{
+    public static void propagate(Throwable t)
+    {
+        if (t instanceof Error)
+            throw (Error)t;
+        if (t instanceof RuntimeException)
+            throw (RuntimeException)t;
+        throw new RuntimeException(t);
+    }
+}
diff --git a/src/main/java/net/minecraftforge/gradle/util/caching/WriteCacheAction.java b/src/main/java/net/minecraftforge/gradle/util/caching/WriteCacheAction.java
@@ -23,11 +23,11 @@
 import java.util.List;
 
 import net.minecraftforge.gradle.common.Constants;
+import net.minecraftforge.gradle.util.ThrowableUtil;
 
 import org.gradle.api.Action;
 import org.gradle.api.Task;
 
-import com.google.common.base.Throwables;
 import com.google.common.io.Files;
 
 public class WriteCacheAction implements Action<Task>
@@ -64,7 +64,7 @@ public void execute(ICachableTask task)
         // error? spit it and do the task.
         catch (Exception e)
         {
-            Throwables.propagate(e);
+            ThrowableUtil.propagate(e);
         }
     }
 
diff --git a/src/main/resources/GradleStart.java b/src/main/resources/GradleStart.java

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@`
`28`	`28`	`import java.lang.reflect.Type;`
`29`	`29`	`import java.net.HttpURLConnection;`
`30`	`30`	`import java.net.URL;`
`31`		`-import java.util.Arrays;`
`32`	`31`	`import java.util.Collections;`
`33`	`32`	`import java.util.List;`
`34`	`33`	`import java.util.Map;`
`@@ -446,9 +445,9 @@ public Boolean call()`
`446`	`445`	`Files.write(buf.toString().getBytes(Charsets.UTF_8), delayedFile("jsons/" + Constants.REPLACE_MC_VERSION + ".json").call());`
`447`	`446`	`}`
`448`	`447`	`}`
`449`		`- catch (Throwable t)`
	`448`	`+ catch (IOException e)`
`450`	`449`	`{`
`451`		`- Throwables.propagate(t);`
	`450`	`+ throw new RuntimeException(e);`
`452`	`451`	`}`
`453`	`452`	`return true;`
`454`	`453`	`}`
`@@ -772,7 +771,7 @@ else if (con.getResponseCode() == 200)`
`772`	`771`	`}`
`773`	`772`	`catch (IOException e)`
`774`	`773`	`{`
`775`		`- Throwables.propagate(e);`
	`774`	`+ throw new RuntimeException(e);`
`776`	`775`	`}`
`777`	`776`	`}`
`778`	`777`
`@@ -801,10 +800,10 @@ protected Version parseAndStoreVersion(File file, File... inheritanceDirs)`
`801`	`800`	`{`
`802`	`801`	`version = JsonFactory.loadVersion(file, delayedString(REPLACE_MC_VERSION).call(), inheritanceDirs);`
`803`	`802`	`}`
`804`		`- catch (Exception e)`
	`803`	`+ catch (IOException e)`
`805`	`804`	`{`
`806`	`805`	`LOGGER.error("" + file + " could not be parsed");`
`807`		`- Throwables.propagate(e);`
	`806`	`+ throw new RuntimeException(e);`
`808`	`807`	`}`
`809`	`808`	`}`
`810`	`809`
Original file line number	Diff line number	Diff line change
`@@ -36,15 +36,14 @@`
`36`	`36`	`import org.objectweb.asm.Opcodes;`
`37`	`37`
`38`	`38`	`import com.google.common.base.Charsets;`
`39`		`-import com.google.common.base.Throwables;`
`40`	`39`	`import com.google.common.io.ByteStreams;`
`41`	`40`	`import com.google.common.io.Files;`
`42`	`41`
`43`	`42`	`class TaskExtractExcModifiers extends DefaultTask`
`44`	`43`	`{`
`45`	`44`	`@InputFile`
`46`	`45`	`private Object inJar;`
`47`		`-`
	`46`	`+`
`48`	`47`	`@OutputFile`
`49`	`48`	`private Object outExc;`
`50`	`49`
`@@ -53,11 +52,11 @@ class TaskExtractExcModifiers extends DefaultTask`
`53`	`52`	`* Default is for minecraft`
`54`	`53`	`*/`
`55`	`54`	`String matchingPrefix = "net/minecraft/";`
`56`		`-`
	`55`	`+`
`57`	`56`	`//@formatter:off`
`58`	`57`	`public TaskExtractExcModifiers() { super(); }`
`59`	`58`	`//@formatter:on`
`60`		`-`
	`59`	`+`
`61`	`60`	`@TaskAction`
`62`	`61`	`public void doStuff() throws IOException`
`63`	`62`	`{`
`@@ -69,7 +68,7 @@ public void doStuff() throws IOException`
`69`	`68`
`70`	`69`	`output.getParentFile().mkdirs();`
`71`	`70`	`output.createNewFile();`
`72`		`-`
	`71`	`+`
`73`	`72`	`try (BufferedWriter writer = Files.newWriter(output, Charsets.UTF_8);`
`74`	`73`	`ZipInputStream zin = new ZipInputStream(new FileInputStream(input)))`
`75`	`74`	`{`
`@@ -94,7 +93,7 @@ public void doStuff() throws IOException`
`94`	`93`	`}`
`95`	`94`	`}`
`96`	`95`	`}`
`97`		`-`
	`96`	`+`
`98`	`97`	`private static class GenerateMapClassAdapter extends ClassVisitor`
`99`	`98`	`{`
`100`	`99`	`String className;`
`@@ -132,7 +131,7 @@ public MethodVisitor visitMethod(int access, String name, String desc, String si`
`132`	`131`	`}`
`133`	`132`	`catch (IOException e)`
`134`	`133`	`{`
`135`		`- Throwables.propagate(e);`
	`134`	`+ throw new RuntimeException(e);`
`136`	`135`	`}`
`137`	`136`	`return super.visitMethod(access, name, desc, signature, exceptions);`
`138`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@`
`45`	`45`	`import com.google.common.base.Charsets;`
`46`	`46`	`import com.google.common.base.Joiner;`
`47`	`47`	`import com.google.common.base.Strings;`
`48`		`-import com.google.common.base.Throwables;`
`49`	`48`	`import com.google.common.collect.Lists;`
`50`	`49`	`import com.google.common.collect.Maps;`
`51`	`50`	`import com.google.common.io.Files;`
`@@ -287,10 +286,8 @@ private FileCollection generateDefaultExc(File modifiers, FileCollection current`
`287`	`286`	`}`
`288`	`287`	`catch (IOException e)`
`289`	`288`	`{`
`290`		`- Throwables.propagate(e);`
	`289`	`+ throw new RuntimeException(e);`
`291`	`290`	`}`
`292`		`-`
`293`		`- return null;`
`294`	`291`	`}`
`295`	`292`
`296`	`293`	`@InputFiles @SkipWhenEmpty`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`import java.util.Set;`
`31`	`31`
`32`	`32`	`import net.minecraftforge.gradle.common.Constants;`
	`33`	`+import net.minecraftforge.gradle.util.ThrowableUtil;`
`33`	`34`	`import net.minecraftforge.gradle.util.caching.Cached;`
`34`	`35`	`import net.minecraftforge.gradle.util.caching.CachedTask;`
`35`	`36`
`@@ -206,10 +207,9 @@ private String getResource(URL resource)`
`206`	`207`	`{`
`207`	`208`	`return Resources.toString(resource, Charsets.UTF_8);`
`208`	`209`	`}`
`209`		`- catch (Exception e)`
	`210`	`+ catch (IOException e)`
`210`	`211`	`{`
`211`		`- Throwables.propagate(e);`
`212`		`- return "";`
	`212`	`+ throw new RuntimeException(e);`
`213`	`213`	`}`
`214`	`214`	`}`
`215`	`215`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,6 @@`
`43`	`43`	`import com.google.common.base.Charsets;`
`44`	`44`	`import com.google.common.base.Splitter;`
`45`	`45`	`import com.google.common.base.Strings;`
`46`		`-import com.google.common.base.Throwables;`
`47`	`46`	`import com.google.common.collect.Iterables;`
`48`	`47`	`import com.google.common.io.CharStreams;`
`49`	`48`	`import com.google.common.io.Files;`
`@@ -118,10 +117,10 @@ private void exportLocalizations(String projectId, String key) throws IOExceptio`
`118`	`117`	`{`
`119`	`118`	`con.connect();`
`120`	`119`	`}`
`121`		`- catch (Throwable e)`
	`120`	`+ catch (IOException e)`
`122`	`121`	`{`
`123`	`122`	`// just in case people dont have internet at the moment.`
`124`		`- Throwables.propagate(e);`
	`123`	`+ throw new RuntimeException(e);`
`125`	`124`	`}`
`126`	`125`
`127`	`126`	`int reponse = con.getResponseCode();`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,6 @@`
`42`	`42`	`import org.gradle.api.tasks.util.PatternFilterable;`
`43`	`43`	`import org.gradle.api.tasks.util.PatternSet;`
`44`	`44`
`45`		`-import com.google.common.base.Throwables;`
`46`		`-`
`47`	`45`	`public class SplitJarTask extends CachedTask implements PatternFilterable`
`48`	`46`	`{`
`49`	`47`	`@InputFile`
`@@ -111,7 +109,7 @@ public void visitFile(FileVisitDetails details)`
`111`	`109`	`}`
`112`	`110`	`catch (IOException e)`
`113`	`111`	`{`
`114`		`- Throwables.propagate(e);`
	`112`	`+ throw new RuntimeException(e);`
`115`	`113`	`}`
`116`	`114`	`}`
`117`	`115`	`});`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,6 @@`
`42`	`42`	`import org.gradle.api.tasks.OutputFile;`
`43`	`43`	`import org.gradle.api.tasks.TaskAction;`
`44`	`44`
`45`		`-import com.google.common.base.Throwables;`
`46`	`45`	`import com.google.common.collect.ImmutableMap;`
`47`	`46`	`import com.google.common.collect.Sets;`
`48`	`47`	`import com.google.common.io.Files;`
`@@ -191,7 +190,7 @@ public void visitDir(FileVisitDetails dir)`
`191`	`190`	`}`
`192`	`191`	`catch (IOException e)`
`193`	`192`	`{`
`194`		`- Throwables.propagate(e);`
	`193`	`+ throw new RuntimeException(e);`
`195`	`194`	`}`
`196`	`195`	`}`
`197`	`196`
`@@ -212,7 +211,7 @@ public void visitFile(FileVisitDetails file)`
`212`	`211`	`}`
`213`	`212`	`catch (IOException e)`
`214`	`213`	`{`
`215`		`- Throwables.propagate(e);`
	`214`	`+ throw new RuntimeException(e);`
`216`	`215`	`}`
`217`	`216`	`}`
`218`	`217`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@`
`26`	`26`	`import java.io.FileInputStream;`
`27`	`27`	`import java.io.FileOutputStream;`
`28`	`28`	`import java.io.IOException;`
`29`		`-import java.nio.file.*;`
`30`	`29`	`import java.util.Collections;`
`31`	`30`	`import java.util.HashMap;`
`32`	`31`	`import java.util.HashSet;`
`@@ -48,7 +47,6 @@`
`48`	`47`	`import org.gradle.api.tasks.TaskAction;`
`49`	`48`
`50`	`49`	`import com.google.common.base.Joiner;`
`51`		`-import com.google.common.base.Throwables;`
`52`	`50`	`import com.google.common.collect.Maps;`
`53`	`51`	`import com.google.common.io.ByteArrayDataInput;`
`54`	`52`	`import com.google.common.io.ByteStreams;`
`@@ -168,7 +166,7 @@ public void visitFile(FileVisitDetails file)`
`168`	`166`	`}`
`169`	`167`	`catch (IOException e)`
`170`	`168`	`{`
`171`		`- throw Throwables.propagate(e);`
	`169`	`+ throw new RuntimeException(e);`
`172`	`170`	`}`
`173`	`171`	`}`
`174`	`172`
`@@ -197,9 +195,9 @@ public void setup()`
`197`	`195`	`}`
`198`	`196`	`bytes = jarBytes.toByteArray();`
`199`	`197`	`}`
`200`		`- catch (Exception e)`
	`198`	`+ catch (IOException e)`
`201`	`199`	`{`
`202`		`- throw Throwables.propagate(e);`
	`200`	`+ throw new RuntimeException(e);`
`203`	`201`	`}`
`204`	`202`
`205`	`203`	`log("Reading Patches:");`
`@@ -223,7 +221,7 @@ public void setup()`
`223`	`221`	`}`
`224`	`222`	`catch (IOException e)`
`225`	`223`	`{`
`226`		`- throw Throwables.propagate(e);`
	`224`	`+ throw new RuntimeException(e);`
`227`	`225`	`}`
`228`	`226`	`log("Read %d binary patches", patchlist.size());`
`229`	`227`	`log("Patch list :\n\t%s", Joiner.on("\n\t").join(patchlist.entrySet()));`