misc fixes

This commit is contained in:
linsui 2021-06-20 11:12:24 +08:00
parent e86a7c78a4
commit 74e891af5a
5 changed files with 3 additions and 85 deletions

View file

@ -397,14 +397,6 @@ Builds:
gradle:
- yes
- versionName: 6.6.1
versionCode: 661
commit: v6.6.1
subdir: PersianCalendar
submodules: true
gradle:
- yes
- versionName: 6.6.2
versionCode: 662
commit: v6.6.2

View file

@ -52,7 +52,6 @@ Builds:
versionCode: 9
commit: 1.0.8
subdir: app
submodules: true
gradle:
- yes
prebuild: sed -i -e '/splits/,+15d' build.gradle

View file

@ -616,80 +616,6 @@ Builds:
- popd
ndk: r21e
- versionName: 3.6.11
versionCode: 3000283
commit: 3.6.11
subdir: android/app/
sudo:
- sysctl fs.inotify.max_user_watches=524288
- curl -Lo node.tar.gz https://nodejs.org/dist/v14.16.0/node-v14.16.0-linux-x64.tar.gz
- echo "7212031d7468718d7c8f5e1766380daaabe09d54611675338e7a88a97c3e31b6 node.tar.gz"
| sha256sum -c -
- tar xf node.tar.gz
- cp -a node-v14.16.0-linux-x64/. /usr/local/
- npm -g install yarn
init:
- cd ../..
- yarn cache clean snjs
- npm_config_build_from_source=true yarn --force
patch:
- bugsnag.patch
gradle:
- prod
srclibs:
- libsodium@1.0.18
rm:
- .gitmodules
prebuild:
- $ANDROID_HOME/tools/bin/sdkmanager 'cmake;3.10.2.4988404' > /dev/null
- sed -i -e '/splits\ {/,+7d' -e '/detox/d' -e '/DETOX_CI/d' build.gradle
- sed -i -e "s/versionName appVersionName/versionName \"$$VERSION$$\"/" -e "s/versionCode
appVersionCode/versionCode $$VERCODE$$/" build.gradle
- sed -i -e "/appVersionName/d" -e "/appVersionCode/d" build.gradle
- sed -i -e "/@bugsnag\/react-native/d" -e "/bugsnag-sourcemaps/d" ../../package.json
scanignore:
- android/build.gradle
- node_modules/hermes-engine
- node_modules/jsc-android
- node_modules/react-native
- node_modules/detox/android/build.gradle
- node_modules/detox/android/detox/detox-publishing.gradle
- node_modules/sn-textview/android/build.gradle
- node_modules/standard-notes-rn/android/build.gradle
- node_modules/@react-native-community/async-storage/android/build.gradle
- node_modules/@react-native-community/masked-view/android/build.gradle
scandelete:
- node_modules/
build:
- lib="$PWD/../../node_modules/react-native-sodium/libsodium"
- target_sdk_version=`sed -n -E 's/.*targetSdkVersion = ([0-9]{1,2}).*/\1/p'
../build.gradle`
- pushd $$libsodium$$
- CC="$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi${target_sdk_version}-clang"
CFLAGS="-Os -fPIC -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb -marm -march=armv7-a"
./configure --prefix=${lib}/libsodium-android-armv7-a/ --host=arm-linux-androideabi
- make -j${nproc}
- make install
- make distclean
- CC="$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android${target_sdk_version}-clang"
CFLAGS="-fPIC -O2" ./configure --prefix=${lib}/libsodium-android-armv8-a/
--host=aarch64-linux-android
- make -j${nproc}
- make install
- make distclean
- CC="$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android${target_sdk_version}-clang"
CFLAGS="-fPIC -O2" ./configure --prefix=${lib}/libsodium-android-i686/ --host=i686-linux-android
- make -j${nproc}
- make install
- make distclean
- CC="$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android${target_sdk_version}-clang"
CFLAGS="-fPIC -O2" ./configure --prefix=${lib}/libsodium-android-westmere/
--host=x86_64-linux-android
- make -j${nproc}
- make install
- popd
ndk: r21e
AutoUpdateMode: Version %v
UpdateCheckMode: HTTP
VercodeOperation: 3000220 + %c

View file

@ -959,7 +959,7 @@ Builds:
- src/androidTest/resources/fixtures/military.zip
- versionName: 15.2.3.0
versionCode: 1704
versionCode: 1705
commit: 15.2.3.0
gradle:
- current
@ -974,4 +974,4 @@ AutoUpdateMode: Version
UpdateCheckMode: Tags ^[0-9]+\.[0-9]+\.[0-9]+\.0$
UpdateCheckData: src/main/AndroidManifest.xml|android:versionCode="(\d+)"||
CurrentVersion: 15.2.3.0
CurrentVersionCode: 1704
CurrentVersionCode: 1705

View file

@ -44,6 +44,7 @@ Builds:
subdir: app
gradle:
- yes
prebuild: sed -i -e '/crashlytics/Id' -e '/fabric/Id' build.gradle src/main/java/it/mobimentum/dualsimwidget/DualSimApp.java
AutoUpdateMode: Version
UpdateCheckMode: Tags