Merge pull request #222 from sora-xor/fix/backup-on-soralution

fix proguard and backup version
sora-xor · Oct 10, 2023 · a6f6f5e · a6f6f5e
2 parents cb8a0d4 + 7867b34
commit a6f6f5e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -175,3 +175,17 @@
 # Needed by google-play-services when linking against an older platform version
 
 -dontwarn com.google.android.gms.**
+
+-keep class com.google.** { *;}
+-keep interface com.google.** { *;}
+-dontwarn com.google.**
+
+-dontwarn sun.misc.Unsafe
+-dontwarn com.google.common.collect.MinMaxPriorityQueue
+-keepattributes *Annotation*,Signature
+-keep class * extends com.google.api.client.json.GenericJson {
+*;
+}
+-keep class com.google.api.services.drive.** {
+*;
+}
diff --git a/build.gradle b/build.gradle
@@ -50,7 +50,7 @@ buildscript {
             accompanist            : '0.30.1',
             xserializationjson     : '1.5.1',
             ktor                   : '2.3.1',
-            xbackup                : '0.0.2-20231002.173502-3'
+            xbackup                : '1.0.0'
     ]
 
     ext {
@@ -127,7 +127,7 @@ buildscript {
         googlePlayCoreDep = "com.google.android.play:core:$versions.googlePlayCore"
         googleFirebaseBomDep = "com.google.firebase:firebase-bom:$versions.googleFirebaseBom"
         googlePlayServiceAuth = "com.google.android.gms:play-services-auth:$versions.googlePlayServiceAuth"
-        googleApiServicesDrive = "com.google.apis:google-api-services-drive:$versions.googleApiServiceDrive"
+        googleApiServicesDrive = "com.google.apis:google-api-services-drive:$versions.googleApiServicesDrive"
 
         ed25519Dep = "com.github.warchant:ed25519-sha3-java:$versions.ed25519"
         spongycastleDep = "com.madgag.spongycastle:core:$versions.spongycastle"