diff --git a/project/app/build-template.gradle b/project/app/build-template.gradle index 694673b71..ed6ba96df 100644 --- a/project/app/build-template.gradle +++ b/project/app/build-template.gradle @@ -14,7 +14,7 @@ android { buildTypes { release { minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android.txt'), '../proguard-local.cfg' + proguardFiles getDefaultProguardFile('proguard-android.txt'), '../proguard-local.cfg', '../proguard.cfg' } } diff --git a/project/jni/application/openttd-jgrpp/AndroidAppSettings.cfg b/project/jni/application/openttd-jgrpp/AndroidAppSettings.cfg index 7ff148d49..ecbfa5276 100644 --- a/project/jni/application/openttd-jgrpp/AndroidAppSettings.cfg +++ b/project/jni/application/openttd-jgrpp/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="OpenTTD JGR" AppFullName=org.openttd.jgrpp # Application version code (integer) -AppVersionCode=021072 +AppVersionCode=021073 # Application user-visible version name (string) -AppVersionName="0.21.0.72" +AppVersionName="0.21.0.73" # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...' # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu diff --git a/project/jni/application/openttd/AndroidAppSettings.cfg b/project/jni/application/openttd/AndroidAppSettings.cfg index d792c0f39..dc6c87adc 100644 --- a/project/jni/application/openttd/AndroidAppSettings.cfg +++ b/project/jni/application/openttd/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="OpenTTD" AppFullName=org.openttd.sdl # Application version code (integer) -AppVersionCode=17172 +AppVersionCode=17173 # Application user-visible version name (string) -AppVersionName="1.7.1.72" +AppVersionName="1.7.1.73" # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...' # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu diff --git a/project/proguard.cfg b/project/proguard.cfg index 3a01412a3..05ec487d7 100644 --- a/project/proguard.cfg +++ b/project/proguard.cfg @@ -1,53 +1,6 @@ --optimizationpasses 0 --dontusemixedcaseclassnames --dontskipnonpubliclibraryclasses --dontpreverify --verbose --optimizations !code/simplification/arithmetic,!field/*,!class/merging/* - --keep public class * extends android.app.Activity --keep public class * extends android.app.Application --keep public class * extends android.app.Service --keep public class * extends android.content.BroadcastReceiver --keep public class * extends android.content.ContentProvider --keep public class * extends android.app.backup.BackupAgentHelper --keep public class * extends android.preference.Preference -keep public class com.android.vending.licensing.ILicensingService --keepclasseswithmembernames class * { - native ; -} - --keepclasseswithmembernames class * { - public (android.content.Context, android.util.AttributeSet); -} - --keepclasseswithmembernames class * { - public (android.content.Context, android.util.AttributeSet, int); -} - --keepclassmembers enum * { - public static **[] values(); - public static ** valueOf(java.lang.String); -} - --keep class * implements android.os.Parcelable { - public static final android.os.Parcelable$Creator *; -} - -keep class com.google.android.gms.games.snapshot.SnapshotMetadataEntity { *; } - --keep class org.apache.http.** { *; } --keep class org.apache.commons.codec.** { *; } --keep class org.apache.commons.logging.** { *; } --keep class android.net.compatibility.** { *; } --keep class android.net.http.** { *; } --dontwarn org.apache.http.** --dontwarn android.webkit.** --dontwarn android.support.v4.app.** --dontwarn com.google.android.gms.** --dontwarn sun.misc.Unsafe -