Merge branch 'saifix45' into 'master'

SAI - fix build, update, but disable latest

See merge request fdroid/fdroiddata!6434

metadata/com.aefyr.sai.fdroid.yml

@@ -147,19 +147,20 @@ Builds:
       - popd
       - cp $$aefyr-android-filepicker$$/build/outputs/aar/filepicker-release.aar libs/filepicker-release.aar
 
-  - versionName: '3.4'
-    versionCode: 45
-    commit: '3.4'
+  - versionName: '3.7'
+    versionCode: 48
+    disable: unknown maven
+    commit: '3.7'
     subdir: app
+    patch:
+      - build.patch
     gradle:
       - fdroid
     srclibs:
       - aefyr-android-filepicker@d7d923f8f58f89c732f31059d74952d7dcefb288
     rm:
       - app/libs/filepicker-release.aar
-    prebuild:
-      - sed -i -e '/maven/,+2d' -e '/io.fabric/d' ../build.gradle
-      - sed -i -e '/io.fabric/d' build.gradle
+    prebuild: sed -i -e '/io.fabric/d' build.gradle
     build:
       - pushd $$aefyr-android-filepicker$$
       - gradle assembleRelease
@@ -168,5 +169,5 @@ Builds:
 
 AutoUpdateMode: Version %v
 UpdateCheckMode: Tags
-CurrentVersion: '3.4'
-CurrentVersionCode: 45
+CurrentVersion: '3.7'
+CurrentVersionCode: 48

metadata/com.aefyr.sai.fdroid/build.patch

@@ -0,0 +1,30 @@
+--- a/build.gradle
++++ b/build.gradle
+@@ -8,14 +8,10 @@
+         flatDir {
+             dirs 'libs'
+         }
+-        maven {
+-            url 'https://maven.fabric.io/public'
+-        }
+     }
+     dependencies {
+         classpath 'com.google.gms:google-services:4.3.3'
+         classpath 'com.android.tools.build:gradle:3.5.3'
+-        classpath 'io.fabric.tools:gradle:1.31.0'
+ 
+         // NOTE: Do not place your application dependencies here; they belong
+         // in the individual module build.gradle files
+@@ -26,12 +22,6 @@
+     repositories {
+         google()
+         jcenter()
+-        maven {
+-            url 'https://maven.fabric.io/public'
+-        }
+-        maven {
+-            url 'https://dl.bintray.com/rikkaw/Shizuku'
+-        }
+         maven { url "https://jitpack.io" }
+     }
+ }