Merge branch 'saiupdate' into 'master'

SAI - update, AUM

See merge request fdroid/fdroiddata!6556
This commit is contained in:
Licaon_Kter 2020-03-30 15:18:26 +00:00
commit b4c1e8bf59
2 changed files with 12 additions and 15 deletions

View file

@ -107,29 +107,26 @@ Builds:
- popd - popd
- cp $$aefyr-android-filepicker$$/build/outputs/aar/filepicker-release.aar libs/filepicker-release.aar - cp $$aefyr-android-filepicker$$/build/outputs/aar/filepicker-release.aar libs/filepicker-release.aar
- versionName: '3.7' - versionName: '3.9'
versionCode: 48 versionCode: 51
disable: unknown maven commit: '3.9'
commit: '3.7'
subdir: app subdir: app
patch: patch:
- build.patch - build.patch
gradle: gradle:
- fdroid - fdroid
srclibs: srclibs:
- aefyr-android-filepicker@d7d923f8f58f89c732f31059d74952d7dcefb288 - aefyr-android-filepicker@56c1921965c680a3b0a62c8f8f6467c92ee8ee48
rm: rm:
- app/libs/filepicker-release.aar - app/libs/filepicker-release.aar
prebuild: sed -i -e '/io.fabric/d' build.gradle prebuild: sed -i -e '/io.fabric/d' -e '/google-services/d' build.gradle
build: build:
- pushd $$aefyr-android-filepicker$$ - pushd $$aefyr-android-filepicker$$
- gradle assembleRelease - gradle assembleRelease
- popd - popd
- cp $$aefyr-android-filepicker$$/build/outputs/aar/filepicker-release.aar libs/filepicker-release.aar - cp $$aefyr-android-filepicker$$/build/outputs/aar/filepicker-release.aar libs/filepicker-release.aar
AutoUpdateMode: None AutoUpdateMode: Version %v
UpdateCheckMode: Tags UpdateCheckMode: Tags
CurrentVersion: '3.8' CurrentVersion: '3.9'
CurrentVersionCode: 50 CurrentVersionCode: 51
NoSourceSince: '2.5'

View file

@ -1,6 +1,6 @@
--- a/build.gradle --- a/build.gradle
+++ b/build.gradle +++ b/build.gradle
@@ -8,14 +8,10 @@ @@ -8,14 +8,9 @@
flatDir { flatDir {
dirs 'libs' dirs 'libs'
} }
@ -9,13 +9,13 @@
- } - }
} }
dependencies { dependencies {
classpath 'com.google.gms:google-services:4.3.3' - classpath 'com.google.gms:google-services:4.3.3'
classpath 'com.android.tools.build:gradle:3.5.3' classpath 'com.android.tools.build:gradle:3.6.1'
- classpath 'io.fabric.tools:gradle:1.31.0' - classpath 'io.fabric.tools:gradle:1.31.0'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
@@ -26,12 +22,6 @@ @@ -26,12 +21,6 @@
repositories { repositories {
google() google()
jcenter() jcenter()