From 491b3de3548887834a14062545ad511340493a66 Mon Sep 17 00:00:00 2001 From: Licaon_Kter Date: Wed, 4 Mar 2020 16:18:31 +0000 Subject: [PATCH] SAI - fix build, update, but disable latest --- metadata/com.aefyr.sai.fdroid.yml | 17 +++++++------ metadata/com.aefyr.sai.fdroid/build.patch | 30 +++++++++++++++++++++++ 2 files changed, 39 insertions(+), 8 deletions(-) create mode 100644 metadata/com.aefyr.sai.fdroid/build.patch diff --git a/metadata/com.aefyr.sai.fdroid.yml b/metadata/com.aefyr.sai.fdroid.yml index 7ff48e4fe5..cb62c54933 100644 --- a/metadata/com.aefyr.sai.fdroid.yml +++ b/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 diff --git a/metadata/com.aefyr.sai.fdroid/build.patch b/metadata/com.aefyr.sai.fdroid/build.patch new file mode 100644 index 0000000000..a43b4de13d --- /dev/null +++ b/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" } + } + }