Merge branch 'miscfixes12' into 'master'

Misc fixes after this cycle

See merge request fdroid/fdroiddata!6496
This commit is contained in:
Licaon_Kter 2020-03-19 11:09:34 +00:00
commit 40ff0296fa
4 changed files with 3 additions and 56 deletions

View file

@ -222,37 +222,9 @@ Builds:
- ./link_to_mupdf_1.16.1.sh
ndk: r17c
- versionName: 8.3.7-fdroid
versionCode: 3592
commit: 8.3.7
subdir: app/
sudo:
- apt-get update || apt-get update
- apt-get install -y g++-6 mesa-common-dev libxcursor-dev libxrandr-dev libxinerama-dev
libgl1-mesa-dev
gradle:
- fdroid
srclibs:
- MuPDF@1.16.1
rm:
- Builder/libs/
prebuild:
- sed -i -e '/F-DROID REMOVE THIS LINE/,+1d' ../build.gradle
- sed -i -e '/com.google.gms.google-services/d' -e '/com.google.android.gms/d'
-e '/com.cloudrail/d' -e '/include "armeabi-v7a", "arm64-v8a"/d' build.gradle
- sed -i -e '/git clone/d' -e 's#cd mupdf-$VERSION#pushd '$PWD'/$$MuPDF$$#'
-e 's#/home/ivan-dev/git/LibreraReader/Builder/mupdf-$VERSION#'$PWD'/$$MuPDF$$#'
-e 's#/home/ivan-dev/git/LibreraReader/app/src/main/jniLibs#'$PWD'/src/main/jniLibs#'
-e 's#cd \.\.#popd#' ../Builder/link_to_mupdf_1.16.1.sh
- mkdir src/main/jniLibs/
build:
- pushd ../Builder/
- ./link_to_mupdf_1.16.1.sh
ndk: r17c
- versionName: 8.3.11-fdroid
versionCode: 3604
commit: 8.3.11
- versionName: 8.3.19-fdroid
versionCode: 3636
commit: 8.3.19
subdir: app/
sudo:
- apt-get update || apt-get update

View file

@ -22,13 +22,6 @@ RepoType: git
Repo: https://github.com/92lleo/WhatsappWebToGo
Builds:
- versionName: 1.5.2
versionCode: 27
commit: v1.5.2
subdir: app
gradle:
- yes
- versionName: 1.5.3
versionCode: 28
commit: v1.5.3

View file

@ -345,17 +345,6 @@ Builds:
- app/src/main/res/raw/*
ndk: r18b
- versionName: '55378'
versionCode: 55378
commit: '55378'
subdir: app
gradle:
- yes
prebuild: sed -i -e 's|def ndkDir = ".*"|def ndkDir = "$$NDK$$"|' build.gradle
scanignore:
- app/src/main/res/raw/*
ndk: r18b
- versionName: '55379'
versionCode: 55379
commit: '55379'

View file

@ -112,13 +112,6 @@ Builds:
rm:
- app/src/main/lib/material-intro-screen/material-intro-screen/build.gradle
- versionName: '0.15'
versionCode: 15
commit: v0.15
subdir: app
gradle:
- yes
- versionName: '0.16'
versionCode: 16
commit: v0.16