misc fixes

This commit is contained in:
linsui 2022-01-20 00:22:11 +08:00
parent f5cef821da
commit 0c1ca3ea34
17 changed files with 124 additions and 258 deletions

View file

@ -391,6 +391,10 @@ Builds:
versionCode: 149
commit: 84ed011af4a9172fab85585a6b2bfe7ec49a5908
subdir: app
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk-headless
- update-alternatives --auto java
gradle:
- scMain

View file

@ -708,7 +708,7 @@ Builds:
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
-e '/com.cloudrail/d' -e '/include "x86"/d' build.gradle
- sed -i -e '/^#!/a\set -e' -e 's|git clone .*|ln -s $$MuPDF$$ mupdf-$VERSION|'
-e 's/ndk-build $1/& -j`nproc` || exit 1/' ../Builder/link_to_mupdf_1.16.1.sh
- mkdir src/main/jniLibs/

View file

@ -56,17 +56,14 @@ Builds:
gradle:
- yes
- versionName: 4.0-16
versionCode: 16
commit: ffdc33d35e19f30d0a066090fe48f60606abbe40
subdir: app
gradle:
- yes
- versionName: 4.0-17
versionCode: 17
commit: 40317d80dfed90c7116ad29b8e97c08fa58bfc76
subdir: app
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk-headless
- update-alternatives --auto java
gradle:
- yes

View file

@ -398,8 +398,10 @@ Builds:
rm:
- assembly/google-services.json
- shared/src/main/res/xml/analytics_tracker.xml
prebuild: sed -i -e 's!..\/deagle!$$deagle$$!' -e 's!..\/setup-wizard!$$setupwizard$$!'
prebuild:
- sed -i -e 's!..\/deagle!$$deagle$$!' -e 's!..\/setup-wizard!$$setupwizard$$!'
../settings.gradle
- echo 'org.gradle.jvmargs=-Xmx4096m' >> ../gradle.properties
AutoUpdateMode: Version v%v
UpdateCheckMode: Tags v[\d.]+-\w+$

View file

@ -190,7 +190,7 @@ Builds:
- apt-get install -y openjdk-11-jdk-headless
- update-alternatives --auto java
gradle:
- yes
- fdroid
prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle
AutoUpdateMode: Version %v

View file

@ -45,6 +45,10 @@ Builds:
versionCode: 5000
commit: 33206597546b4402407b0ee706db2d00e9d7be7a
subdir: app
sudo:
- apt-get update || apt-get update
- apt-get install openjdk-11-jdk-headless
- update-alternatives --auto java
gradle:
- stable

View file

@ -400,14 +400,18 @@ Builds:
gradle:
- yes
- versionName: '0.58'
versionCode: 58
commit: 71d5fc759c3c1509f8e8dcc4aa22310437b5c06c
- versionName: '0.59'
versionCode: 59
commit: c0311a0ccbac01a930772a5d7d593b2367ae9ddc
subdir: app
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk-headless
- update-alternatives --auto java
gradle:
- yes
AutoUpdateMode: Version v%v
UpdateCheckMode: Tags
CurrentVersion: '0.58'
CurrentVersionCode: 58
CurrentVersion: '0.59'
CurrentVersionCode: 59

View file

@ -169,113 +169,9 @@ Builds:
- gradle publishToMavenLocal
- popd
- versionName: 1.12.1
versionCode: 59
disable: Could not determine java version from '11.0.6'.
commit: b8fcfff917880498567b9fd9096fdd54c0cab239
subdir: pretixscan/app
submodules: true
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk-headless
- update-alternatives --auto java
gradle:
- pretix
srclibs:
- saki4510t-libcommon@2.12.4
- covpass-android@v-1.165.6
prebuild:
- sed -i -e 's|maven.pkg.github.com/Digitaler-Impfnachweis/covpass-android|jitpack.io|'
-e 's|maven.pkg.github.com/ehn-dcc-development/*|jitpack.io|' -i -e '/repositories
{/a mavenLocal()' ../build.gradle
- sed -i -e "s/(project(':libuvccamera'))/('com.github.raphaelm.UVCCamera:libuvccamera:53d043fea2')
{exclude group:'com.serenegiant',module:'common'}/" -i -e "s/(project(':usbCameraCommon'))/('com.github.raphaelm.UVCCamera:usbCameraCommon:53d043fea2')
{exclude group:'com.serenegiant',module:'common'}/" -i -e '/maven {/,/^ }/d'
-i -e '/repositories {/a mavenLocal()' ../libpretixui-repo/libpretixui-android/build.gradle
scandelete:
- pretixscan/libpretixui-repo
build:
- pushd $$saki4510t-libcommon$$/common
- gradle uploadArchives
- popd
- mv $$saki4510t-libcommon$$/repository/com/serenegiant/common/2.12.4/common-2.12.4.aar
../libpretixui-repo/common/common.aar
- pushd $$covpass-android$$
- gradle publishToMavenLocal
- popd
- versionName: 1.12.2
versionCode: 60
disable: Could not determine java version from '11.0.6'.
commit: 63a8cafb8412ff486f3130eb1b3d12c25cb2acce
subdir: pretixscan/app
submodules: true
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk-headless
- update-alternatives --auto java
gradle:
- pretix
srclibs:
- saki4510t-libcommon@2.12.4
- covpass-android@v-1.165.6
prebuild:
- sed -i -e 's|maven.pkg.github.com/Digitaler-Impfnachweis/covpass-android|jitpack.io|'
-e 's|maven.pkg.github.com/ehn-dcc-development/*|jitpack.io|' -i -e '/repositories
{/a mavenLocal()' ../build.gradle
- sed -i -e "s/(project(':libuvccamera'))/('com.github.raphaelm.UVCCamera:libuvccamera:53d043fea2')
{exclude group:'com.serenegiant',module:'common'}/" -i -e "s/(project(':usbCameraCommon'))/('com.github.raphaelm.UVCCamera:usbCameraCommon:53d043fea2')
{exclude group:'com.serenegiant',module:'common'}/" -i -e '/maven {/,/^ }/d'
-i -e '/repositories {/a mavenLocal()' ../libpretixui-repo/libpretixui-android/build.gradle
scandelete:
- pretixscan/libpretixui-repo
build:
- pushd $$saki4510t-libcommon$$/common
- gradle uploadArchives
- popd
- mv $$saki4510t-libcommon$$/repository/com/serenegiant/common/2.12.4/common-2.12.4.aar
../libpretixui-repo/common/common.aar
- pushd $$covpass-android$$
- gradle publishToMavenLocal
- popd
- versionName: 1.13.1
versionCode: 62
disable: Could not determine java version from '11.0.6'.
commit: f494ede91adb13535e93db0ac826295e8ce4eb61
subdir: pretixscan/app
submodules: true
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk-headless
- update-alternatives --auto java
gradle:
- pretix
srclibs:
- saki4510t-libcommon@2.12.4
- covpass-android@v-1.165.6
prebuild:
- sed -i -e 's|maven.pkg.github.com/Digitaler-Impfnachweis/covpass-android|jitpack.io|'
-e 's|maven.pkg.github.com/ehn-dcc-development/*|jitpack.io|' -i -e '/repositories
{/a mavenLocal()' ../build.gradle
- sed -i -e "s/(project(':libuvccamera'))/('com.github.raphaelm.UVCCamera:libuvccamera:53d043fea2')
{exclude group:'com.serenegiant',module:'common'}/" -i -e "s/(project(':usbCameraCommon'))/('com.github.raphaelm.UVCCamera:usbCameraCommon:53d043fea2')
{exclude group:'com.serenegiant',module:'common'}/" -i -e '/maven {/,/^ }/d'
-i -e '/repositories {/a mavenLocal()' ../libpretixui-repo/libpretixui-android/build.gradle
scandelete:
- pretixscan/libpretixui-repo
build:
- pushd $$saki4510t-libcommon$$/common
- gradle uploadArchives
- popd
- mv $$saki4510t-libcommon$$/repository/com/serenegiant/common/2.12.4/common-2.12.4.aar
../libpretixui-repo/common/common.aar
- pushd $$covpass-android$$
- gradle publishToMavenLocal
- popd
- versionName: 1.13.2
versionCode: 63
disable: Could not determine java version from '11.0.6'.
commit: 3f71098dc7f1c86cc473397f316fd3c8a07c373c
subdir: pretixscan/app
submodules: true

View file

@ -97,27 +97,29 @@ Builds:
versionCode: 37
commit: 02694abab7ff804e09917aa1d1fdd4f00c254530
subdir: app
submodules: true
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk-headless
- update-alternatives --auto java
- curl -Lso go.tar.gz https://golang.org/dl/go1.16.4.linux-amd64.tar.gz
- echo "7154e88f5a8047aad4b80ebace58a059e36e7e2e4eb3b383127a28c711b4ff59 go.tar.gz"
| sha256sum -c -
- tar xzf go.tar.gz --strip-components=1 -C /usr/local/
gradle:
- yes
prebuild:
- mv ../acra.properties.sample ../acra.properties
- sed -i -e '/signingConfig\ signing/d' -e '/ndkVersion/d' build.gradle
build:
- sed -i '/signingConfig\ signing/d' build.gradle
- sed -i '/ndkVersion/d' build.gradle
- curl -Lso go.tar.gz https://golang.org/dl/go1.15.4.linux-amd64.tar.gz
- echo "eb61005f0b932c93b424a3a4eaa67d72196c79129d9a3ea8578047683e2c80d5 go.tar.gz"
| sha256sum -c -
- mkdir -p golang
- tar -C golang -xzf go.tar.gz
- export GOPATH="$PWD"
- export GO_LANG="$PWD/golang/go/bin"
- export GO_COMPILED="$PWD/bin"
- export PATH="$GO_LANG:$GO_COMPILED:$PATH"
- export ANDROID_SDK_ROOT=$$SDK$$
- export ANDROID_NDK_ROOT=$$NDK$$
- export PATH=$(pwd)/go/bin:$PATH
- go version
- ./golang/go/bin/go get golang.org/x/mobile/cmd/gomobile
- ./bin/gomobile init
- cd ../yggdrasil; make
- export GOPATH="$PWD"
- export GO_COMPILED="$PWD/bin"
- export PATH="$GO_COMPILED:$PATH"
- go get golang.org/x/mobile/cmd/gomobile
- cd ../yggdrasil
- make
ndk: r21e
AutoUpdateMode: Version v%v

View file

@ -603,53 +603,10 @@ Builds:
- ./run fdroid build
ndk: r23b
- versionName: 0.7-beta04
versionCode: 730
commit: 56be7af517a1e885baf5d1d6d3352efd8434c1b3
subdir: app
submodules: true
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk-headless
- update-alternatives --auto java
gradle:
- fdroid
prebuild:
- cd ..
- ./run fdroid prebuild
scandelete:
- external
- plugin
build:
- cd ..
- ./run fdroid build
ndk: r23b
- versionName: 0.7-beta06
versionCode: 740
commit: ac56eb1392277833d372dea59d8100b7decc0c2b
subdir: app
submodules: true
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk-headless
- update-alternatives --auto java
gradle:
- fdroid
prebuild:
- cd ..
- ./run fdroid prebuild
scandelete:
- external
- plugin
build:
- cd ..
- ./run fdroid build
ndk: r23b
- versionName: 0.7-rc01
versionCode: 745
commit: 68d6f78cd3973f029a20d1752e6b4551a684c0cf
- versionName: 0.7-rc02
versionCode: 750
disable: https://github.com/SagerNet/SagerNet/issues/346
commit: f1cb7e67ad2c84bc5956cc2460935f7eb272544f
subdir: app
submodules: true
sudo:
@ -673,5 +630,5 @@ AutoUpdateMode: Version
UpdateCheckMode: Tags ^\d.*
VercodeOperation: '%c * 5'
UpdateCheckData: sager.properties|VERSION_CODE=(\d+)||
CurrentVersion: 0.7-rc01
CurrentVersionCode: 745
CurrentVersion: 0.7-rc02
CurrentVersionCode: 750

View file

@ -34,7 +34,7 @@ Builds:
versionCode: 14
commit: 96c4b165ac73ae43c4e462456fba083d04827363
output: unsigned.apk
prebuild: $ANDROID_HOME/tools/bin/sdkmanager 'platforms;android-29' > /dev/null
prebuild: $$SKD$$/tools/bin/sdkmanager 'platforms;android-30' > /dev/null
build:
- make _build/juloo.keyboard2.unsigned-apk
- mv _build/juloo.keyboard2.unsigned-apk unsigned.apk

View file

@ -180,6 +180,10 @@ Builds:
versionCode: 519
commit: 5bfe551663da928b5dcffc3c60084fd8a0467fea
subdir: app
sudo:
- apt-get update || apt-get update
- apt-get install openjdk-11-jdk-headless
- update-alternatives --auto java
gradle:
- yes

View file

@ -1595,9 +1595,9 @@ Builds:
- aTalk/jni/vpx/android/
prebuild:
- JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 $$SDK$$/tools/bin/sdkmanager 'ndk;18.1.5063045'
'build-tools;31.0.0' 'build-tools;30.0.3' 'platforms;android-31' > /dev/null
- cp $$SDK$$/build-tools/30.0.3/lib/dx.jar $$SDK$$/build-tools/31.0.0/lib/dx.jar
- cp $$SDK$$/build-tools/30.0.3/dx $$SDK$$/build-tools/31.0.0/dx
'build-tools;32.0.0' 'build-tools;30.0.3' > /dev/null
- cp $$SDK$$/build-tools/30.0.3/lib/dx.jar $$SDK$$/build-tools/32.0.0/lib/dx.jar
- cp $$SDK$$/build-tools/30.0.3/dx $$SDK$$/build-tools/32.0.0/dx
- sed -i -e 's|dl.bintray.com/google/exoplayer/|jitpack.io|' build.gradle
- cd jni/static_library_built
- sed -i -e '/export ANDROID_NDK_HOME/d' openssl/_settings.sh

View file

@ -66,13 +66,16 @@ Builds:
versionCode: 17
commit: 3dd1548c9f55d63094202ddb96b75118526623bd
subdir: app
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk-headless
- update-alternatives --auto java
gradle:
- yes
prebuild: sed -i -e 's/21.3.6528147/21.4.7075529/' build.gradle
scanignore:
- dictionaries/*_emoji.combined.gz
- dictionaries/*_wordlist.combined.gz
ndk: r21e
ndk: r21d
AutoUpdateMode: Version v%v
UpdateCheckMode: Tags

View file

@ -236,20 +236,6 @@ Builds:
- $$flutter$$/bin/flutter config --no-analytics
- $$flutter$$/bin/flutter build apk
- versionName: 1.17.0
versionCode: 20220102
commit: c70dbb4d7c07309ae29ccdb4adf85c7d224bd575
output: build/app/outputs/flutter-apk/app-release.apk
srclibs:
- flutter@2.8.1
rm:
- ios
- macos
- test
build:
- $$flutter$$/bin/flutter config --no-analytics
- $$flutter$$/bin/flutter build apk
- versionName: 1.18.0
versionCode: 20220116
commit: b5da8fb56c618485b6b48f7875d942b94348f590
@ -257,9 +243,11 @@ Builds:
srclibs:
- flutter@2.8.1
rm:
- apk
- ios
- linux
- macos
- test
- snap
build:
- $$flutter$$/bin/flutter config --no-analytics
- $$flutter$$/bin/flutter build apk

View file

@ -57,6 +57,10 @@ Builds:
versionCode: 6
commit: 5c353ea4d9da8443f093b52e2bdb7cae635cb600
subdir: app
sudo:
- apt-get update || apt-get update
- apt-get install -y openjdk-11-jdk-headless
- update-alternatives --auto java
gradle:
- defaultFlavor

View file

@ -1923,56 +1923,6 @@ Builds:
- npm run build-android-assets
ndk: r21e
- versionName: 0.2201.7-beta-fdroid
versionCode: 116
commit: 431292b61d0561c5cbd98002c0d05efc4b0d7e77
timeout: 80000
subdir: android/app
sudo:
- apt-get update || apt-get update
- apt-get install -y --no-install-recommends g++ lib32stdc++-6-dev libc6-dev-i386
ninja-build linux-libc-dev linux-libc-dev:i386
- curl -Lo node.tar.xz https://nodejs.org/dist/v12.19.1/node-v12.19.1-linux-x64.tar.xz
- echo "1436dbc34383abbe5e921e9744e527cd24c690e7b0362a39fb960795a23a7a03 node.tar.xz"
| sha256sum -c -
- tar xJf node.tar.xz
- cp -a node-v12.19.1-linux-x64/. /usr/local/
- sysctl fs.inotify.max_user_watches=524288
- npm install -g react-native-cli
init: npm install --no-optional
patch:
- 108.patch
gradle:
- fdroid
srclibs:
- NodejsMobile@nodejs-mobile-v0.3.2
rm:
- node_modules/react-native/ReactAndroid/src/main/third-party/java/buck-android-support/buck-android-support.jar
- node_modules/react-native/template/
- desktop
- ios
prebuild: sed -i -e '/lifecycle/d' ../build.gradle
scanignore:
- android/build.gradle
- node_modules/@react-native-community/async-storage/android/build.gradle
- node_modules/react-native-localize/android/build.gradle
- node_modules/react-native-vector-icons/android/build.gradle
- node_modules/react-native-svg/android/build.gradle
- node_modules/react-native/android
- node_modules/hermes-engine
- node_modules/jsc-android
scandelete:
- node_modules
build:
- pushd $$NodejsMobile$$
- ./tools/android_build.sh $$NDK$$ arm > /dev/null
- ./tools/android_build.sh $$NDK$$ arm64 > /dev/null
- popd
- mv $$NodejsMobile$$/out_android/armeabi-v7a/libnode.so ../../node_modules/nodejs-mobile-react-native/android/libnode/bin/armeabi-v7a/libnode.so
- mv $$NodejsMobile$$/out_android/arm64-v8a/libnode.so ../../node_modules/nodejs-mobile-react-native/android/libnode/bin/arm64-v8a/libnode.so
- npm run build-android-assets
ndk: r21e
- versionName: 0.2201.14-beta.b-fdroid
versionCode: 118
commit: ef351a6c4052dafe5d5e3a90f29b01829d2e3886
@ -2024,11 +1974,62 @@ Builds:
- npm run build-android-assets
ndk: r21e
- versionName: 0.2201.19-beta-fdroid
versionCode: 119
commit: a16be0712784f0c4e7986ac8bde7166ac80c033c
timeout: 80000
subdir: android/app
sudo:
- apt-get update || apt-get update
- apt-get install -y --no-install-recommends g++ lib32stdc++-6-dev libc6-dev-i386
ninja-build linux-libc-dev linux-libc-dev:i386
- curl -Lo node.tar.xz https://nodejs.org/dist/v12.19.1/node-v12.19.1-linux-x64.tar.xz
- echo "1436dbc34383abbe5e921e9744e527cd24c690e7b0362a39fb960795a23a7a03 node.tar.xz"
| sha256sum -c -
- tar xJf node.tar.xz
- cp -a node-v12.19.1-linux-x64/. /usr/local/
- sysctl fs.inotify.max_user_watches=524288
- npm install -g react-native-cli
init: npm install --no-optional
patch:
- 108.patch
gradle:
- fdroid
srclibs:
- NodejsMobile@nodejs-mobile-v0.3.3
rm:
- node_modules/react-native/ReactAndroid/src/main/third-party/java/buck-android-support/buck-android-support.jar
- node_modules/react-native/template/
- desktop
- ios
- test
prebuild: sed -i -e '/lifecycle/d' ../build.gradle
scanignore:
- android/build.gradle
- node_modules/@react-native-community/async-storage/android/build.gradle
- node_modules/react-native-localize/android/build.gradle
- node_modules/react-native-vector-icons/android/build.gradle
- node_modules/react-native-svg/android/build.gradle
- node_modules/react-native/android
- node_modules/hermes-engine
- node_modules/jsc-android
scandelete:
- node_modules
build:
- pushd $$NodejsMobile$$
- ./tools/android_build.sh $$NDK$$ arm > /dev/null
- ./tools/android_build.sh $$NDK$$ arm64 > /dev/null
- popd
- mv $$NodejsMobile$$/out_android/armeabi-v7a/libnode.so ../../node_modules/nodejs-mobile-react-native/android/libnode/bin/armeabi-v7a/libnode.so
- mv $$NodejsMobile$$/out_android/arm64-v8a/libnode.so ../../node_modules/nodejs-mobile-react-native/android/libnode/bin/arm64-v8a/libnode.so
- npm run build-android-assets
ndk: r21e
MaintainerNotes: scanignore is used to allow the "node_modules/react-native/android"
local Maven repository which contains the prebuilt react-native library which
we get from npm.
AutoUpdateMode: Version v%v
UpdateCheckMode: Tags
CurrentVersion: 0.2201.14-beta.b-fdroid
CurrentVersionCode: 118
CurrentVersion: 0.2201.19-beta-fdroid
CurrentVersionCode: 119