Merge remote-tracking branch 'origin/master'

OsmAnd/build.gradle

@@ -141,15 +141,15 @@ android {
 
 	buildTypes {
 		debug {
-		    proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
+		    // proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
 		    minifyEnabled true
-		    // proguardFiles 'proguard-project.txt'
+		    proguardFiles 'proguard-project.txt'
 			signingConfig signingConfigs.development
 		}
 		release {
-		    proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
+		    // proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
 		    minifyEnabled true
-		    // proguardFiles 'proguard-project.txt'
+		    proguardFiles 'proguard-project.txt'
 			signingConfig signingConfigs.publishing
 		}
 	}

OsmAnd/proguard-project.txt

@@ -7,32 +7,38 @@
 # Allow obfuscation of android.support.v7.internal.view.menu.**
 # to avoid problem on Samsung 4.2.2 devices with appcompat v21
 # see https://code.google.com/p/android/issues/detail?id=78377
--dontshrink
+-keepattributes **
--dontoptimize
+-keep class !android.support.v7.internal.view.menu.**,** {*;}
+-keep interface ** { *; }
+-keep enum ** { *; }
 -dontpreverify
--verbose
+-dontoptimize
--keep class !android.support.v7.internal.view.menu.**,android.support.** {*;}
+-dontshrink
--keep class net.osmand.** { *; }
--keep interface net.osmand.** { *; }
-
--keep class com.** { *; }
--keep interface com.** { *; }
-
--keep class net.** { *; }
--keep interface net.** { *; }
-
--keep class gnu.** { *; }
--keep interface gnu.** { *; }
-
--keep class org.** { *; }
--keep interface org.** { *; }
-
--keep class bsh.** { *; }
--keep interface bsh.** { *; }
-
--keep class btools.** { *; }
--keep interface btools.** { *; }
-
--keep class alice.** { *; }
--keep interface alice.** { *; }
 -dontwarn alice.**
+-verbose
+
+#-keep class !android.support.v7.internal.view.menu.**,android.support.** {*;}
+#-keep class net.osmand.** { *; }
+#-keep interface net.osmand.** { *; }
+#
+#-keep class com.** { *; }
+#-keep interface com.** { *; }
+#
+#-keep class net.** { *; }
+#-keep interface net.** { *; }
+#
+#-keep class gnu.** { *; }
+#-keep interface gnu.** { *; }
+#
+#-keep class org.** { *; }
+#-keep interface org.** { *; }
+#
+#-keep class bsh.** { *; }
+#-keep interface bsh.** { *; }
+#
+#-keep class btools.** { *; }
+#-keep interface btools.** { *; }
+#
+#-keep class alice.** { *; }
+#-keep interface alice.** { *; }
+#-dontwarn alice.**