misc fixes

This commit is contained in:
linsui 2023-08-31 13:44:20 +08:00
parent 3cf650b970
commit 12fe366418
5 changed files with 15 additions and 6 deletions

View file

@ -522,7 +522,8 @@ Builds:
subdir: android/app
sudo:
- apt-get update
- apt-get install -y automake build-essential libtool
- apt-get install -y automake build-essential libtool openjdk-17-jdk-headless
- update-alternatives --auto java
gradle:
- yes
prebuild:
@ -531,7 +532,7 @@ Builds:
- ../../prepareLibreSSL.sh
scandelete:
- contrib
ndk: r21d
ndk: r21e
MaintainerNotes: We clone submodules in recipe as host git fsck config might interfere

View file

@ -83,7 +83,9 @@ Builds:
- apt-get remove openjdk-11-jdk-headless openjdk-11-jre-headless
- echo "deb http://deb.debian.org/debian sid main" > /etc/apt/sources.list.d/stretch.list
- apt-get update
- apt-get remove openjdk-17-jdk-headless openjdk-17-jre-headless
- apt-get install -y -t sid openjdk-8-jdk-headless
- apt-get remove openjdk-11-jdk-headless openjdk-11-jre-headless
gradle:
- yes

View file

@ -47,15 +47,19 @@ Builds:
output: build/outputs/apk/release/*.apk
build: JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 gradle assembleRelease
- versionName: v22.10.3
- versionName: v23.10
versionCode: 293
commit: 17a19b53b2c928909d2cc4755d48ef9a4aac1f93
subdir: app
sudo:
- apt-get update
- apt-get install -y openjdk-17-jdk-headless
- update-alternatives --auto java
output: build/outputs/apk/release/*.apk
build: JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 gradle assembleRelease
build: JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 gradle assembleRelease
AutoUpdateMode: Version
UpdateCheckMode: Tags ^v.*$
UpdateCheckData: version.txt|\+(\d+)|.|(.+)\+
CurrentVersion: v22.10.3
CurrentVersion: v23.10
CurrentVersionCode: 293

View file

@ -57,7 +57,7 @@ Builds:
sudo:
- apt-get update
- apt-get install -y libncurses5 g++ cmake ruby-full libglvnd-dev libglu1-mesa-dev
freeglut3-dev libasound2-dev python3-distutils
freeglut3-dev libasound2-dev python3-distutils make
gradle:
- yes
scandelete:

View file

@ -40,6 +40,8 @@ Builds:
- yes
srclibs:
- reproducible-apk-tools@v0.2.3
rm:
- app/src/main/res/drawable/launcher_icon_light.xml
postbuild: $$reproducible-apk-tools$$/inplace-fix.py --zipalign fix-newlines $$OUT$$
'assets/chapters.json' 'assets/translation.json' 'assets/verse.json'