Merge branch 'feature/net.asceai.meritous' into 'master'

Meritous: Fix lint errors

See merge request fdroid/fdroiddata!4155
This commit is contained in:
Pierre Rudloff 2018-12-29 17:39:35 +00:00
commit dd069a5e83

View file

@ -20,16 +20,24 @@ Builds:
commit: 03ac99d71e34010491f7a5c578d2ae9c44d73cf3 commit: 03ac99d71e34010491f7a5c578d2ae9c44d73cf3
subdir: project subdir: project
submodules: true submodules: true
init: |- init:
cd .. && make -C src/AndroidData && ./changeAppSettings.sh -a && export PATH=$$NDK$$:$$SDK$$/tools:$PATH && ./build.sh || true - cd ..
- make -C src/AndroidData
- ./changeAppSettings.sh -a
- export PATH=$$NDK$$:$$SDK$$/tools:$PATH
- ./build.sh || true
- versionName: 0.0.2 - versionName: 0.0.2
versionCode: 2 versionCode: 2
commit: 78aeec506e0cc88e865bd86fb41728f4257ddae6 commit: 78aeec506e0cc88e865bd86fb41728f4257ddae6
subdir: project subdir: project
submodules: true submodules: true
init: |- init:
cd .. && make -C src/AndroidData && ./changeAppSettings.sh -a && export PATH=$$NDK$$:$$SDK$$/tools:$PATH && ./build.sh release || true - cd ..
- make -C src/AndroidData
- ./changeAppSettings.sh -a
- export PATH=$$NDK$$:$$SDK$$/tools:$PATH
- ./build.sh release || true
- versionName: 0.0.2 - versionName: 0.0.2
versionCode: 3 versionCode: 3
@ -37,19 +45,27 @@ Builds:
commit: b716c4d43ab901821a0e2c1f25e6c050d5e37346 commit: b716c4d43ab901821a0e2c1f25e6c050d5e37346
subdir: project subdir: project
submodules: true submodules: true
init: |- init:
cd .. && make -C src/AndroidData && ./changeAppSettings.sh -a && export PATH=$$NDK$$:$$SDK$$/tools:$PATH && ./build.sh release || true - cd ..
- make -C src/AndroidData
- ./changeAppSettings.sh -a
- export PATH=$$NDK$$:$$SDK$$/tools:$PATH
- ./build.sh release || true
- versionName: 0.0.4 - versionName: 0.0.4
versionCode: 4 versionCode: 4
commit: bd3b5386fb6211d12af4f69daa125750b556ac19 commit: bd3b5386fb6211d12af4f69daa125750b556ac19
subdir: project/app subdir: project/app
submodules: true submodules: true
init: |- init:
cd ../.. && make -C src/AndroidData && ./changeAppSettings.sh -a - cd ../..
- make -C src/AndroidData
- ./changeAppSettings.sh -a
gradle: gradle:
- yes - yes
build: cd ../.. && ./build.sh release || true build:
- cd ../..
- ./build.sh release || true
ndk: r18b ndk: r18b
AutoUpdateMode: None AutoUpdateMode: None