update proguard, fix expected stack map table for method with non-linear control flow

forge-gui-android/pom.xml

@@ -74,24 +74,6 @@
             <scope>system</scope>
             <systemPath>${pom.basedir}/libs/relinker.jar</systemPath>
         </dependency>
-        <!-- declare a specific dependency to override com.google.android's transitive dependency -->
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.14</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-codec</groupId>
-                    <artifactId>commons-codec</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- declare a specific dependency to override org.apache.httpcomponents's transitive dependency -->
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.17.1</version>
-        </dependency>
         <dependency>
             <groupId>forge</groupId>
             <artifactId>forge-core</artifactId>

forge-gui-android/proguard.cfg

@@ -1,9 +1,10 @@
 -dontobfuscate
--optimizationpasses 3
+#-optimizationpasses 3
 -dontusemixedcaseclassnames
 -dontskipnonpubliclibraryclasses
--dontpreverify
+#-dontpreverify
 -verbose
+-android
 # https://stackoverflow.com/a/32615580
 -optimizations !code/simplification/*,!field/*,!class/merging/*,!code/allocation/variable,!library/gson,!class/unboxing/enum
 
@@ -104,7 +105,7 @@
 -keep public class com.android.vending.licensing.ILicensingService
 -keep public class * extends com.badlogic.gdx.Application
 
--keepclasseswithmembernames class * {
+-keepclasseswithmembernames,includedescriptorclasses class * {
     native <methods>;
 }
 
@@ -129,4 +130,4 @@
   public static final android.os.Parcelable$Creator *;
 }
 
--keepattributes LineNumberTable,SourceFile
+-keepattributes *Annotation*,EnclosingMethod,InnerClasses,LineNumberTable,Signature,SourceFile