Merge branch 'release21_hotfix' into 'master'

fix post upload not working

See merge request pixeldroid/PixelDroid!515
This commit is contained in:
Matthieu 2022-11-30 08:59:37 +00:00
commit f288474dce
2 changed files with 8 additions and 2 deletions

View File

@ -32,7 +32,7 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 33 targetSdkVersion 33
versionCode 20 versionCode 21
versionName "1.0.beta" + versionCode versionName "1.0.beta" + versionCode
//TODO add resConfigs("en", "fr", "ja",...) ? //TODO add resConfigs("en", "fr", "ja",...) ?

View File

@ -170,6 +170,10 @@
-if interface * { @retrofit2.http.* <methods>; } -if interface * { @retrofit2.http.* <methods>; }
-keep,allowobfuscation interface <1> -keep,allowobfuscation interface <1>
# Keep inherited services.
-if interface * { @retrofit2.http.* <methods>; }
-keep,allowobfuscation interface * extends <1>
# Keep generic signature of Call, Response (R8 full mode strips signatures from non-kept items). # Keep generic signature of Call, Response (R8 full mode strips signatures from non-kept items).
-keep,allowobfuscation,allowshrinking interface retrofit2.Call -keep,allowobfuscation,allowshrinking interface retrofit2.Call
-keep,allowobfuscation,allowshrinking class retrofit2.Response -keep,allowobfuscation,allowshrinking class retrofit2.Response
@ -179,3 +183,5 @@
# is used. # is used.
-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation -keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
##---------------End: proguard configuration for Retrofit ---------- ##---------------End: proguard configuration for Retrofit ----------
-keep,allowobfuscation,allowshrinking class io.reactivex.rxjava3.core.Observable