misc fixes

This commit is contained in:
linsui 2024-06-15 17:15:47 +08:00
parent 3ddec5b5bb
commit b981e6a020
8 changed files with 26 additions and 152 deletions

View file

@ -58,13 +58,6 @@ Builds:
gradle:
- yes
- versionName: 0.1.3
versionCode: 13
commit: 153907676ea1318bd8c50093bbf830935ab0811c
subdir: app
gradle:
- withoutInternet
- versionName: 0.1.4
versionCode: 14
commit: 49a5cf67ac9c25c74373251b4dfb047b66f86e31

View file

@ -3550,43 +3550,21 @@ Builds:
timeout: 20000
submodules: true
sudo:
- echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list
- apt-get update
- apt-get install -y make g++ cmake
- apt-get install -y -t bullseye openjdk-11-jdk-headless
gradle:
- fat
srclibs:
- rustup@1.25.1
- maplibre-gl-native@android-v9.5.2
prebuild:
- sdkmanager 'ndk;20.0.5594570'
- sed -i -e '/versionCode/s/$/1/' -e 's/abiFilters .*/abiFilters "armeabi-v7a"/'
-e '/^repositories {/a mavenLocal()' build.gradle
- sed -i -e 's/org.maplibre.gl/org.fdroid/' build.gradle $$maplibre-gl-native$$/platform/android/gradle/artifact-settings.gradle
- cd $$maplibre-gl-native$$/platform/android/MapboxGLAndroidSDK
- sed -i -e '/signing {/,/}/d' -e '/signing/d' ../gradle/gradle-publish.gradle
- sed -i -e '/gmsLocation/d' build.gradle
- cd src/main/java/com/mapbox/mapboxsdk/location/engine
- sed -i -e '/isOnClasspath(GOOGLE_API_AVAILABILITY)/,/}/d' -e '/import.*gms/d'
-e 's|return isGoogle|return //isGoogle|' LocationEngineProvider.java
- rm GoogleLocationEngineImpl.java
- sed -i -e '/private.*extractGooglePlayResult/,/^ }/d' -e '/extractGooglePlayResult/d'
-e '/import.*gms/d' LocationEngineResult.java
prebuild: sed -i -e '/versionCode/s/$/1/' -e 's/abiFilters .*/abiFilters "armeabi-v7a"/'
build.gradle
build:
- pushd $$maplibre-gl-native$$/platform/android
- git submodule update --init --recursive
- export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
- BUILDTYPE=Release make android-lib-arm-v7
- gradle -Pmapbox.abis=armeabi-v7a -PVERSION_NAME=9.5.2 :MapboxGLAndroidSDK:publishToMavenLocal
- popd
- $$rustup$$/rustup-init.sh -y --default-toolchain $(cat scripts/rust-toolchain)
--target armv7-linux-androideabi
- source $HOME/.cargo/env
- sdkmanager "ndk;23.2.8568313"
- export PATH=$PATH:$$SDK$$/ndk/23.2.8568313/toolchains/llvm/prebuilt/linux-x86_64/bin/
- ANDROID_NDK_ROOT=$$SDK$$/ndk/23.2.8568313/ scripts/ndk-make.sh armeabi-v7a
ndk: r20
- PATH=$PATH:$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/ ANDROID_NDK_ROOT=$$NDK$$
scripts/ndk-make.sh armeabi-v7a
ndk: r23c
- versionName: 1.46.3
versionCode: 6862
@ -3594,43 +3572,21 @@ Builds:
timeout: 20000
submodules: true
sudo:
- echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list
- apt-get update
- apt-get install -y make g++ cmake
- apt-get install -y -t bullseye openjdk-11-jdk-headless
gradle:
- fat
srclibs:
- rustup@1.25.1
- maplibre-gl-native@android-v9.5.2
prebuild:
- sed -i -e '/versionCode/s/$/2/' -e 's/abiFilters .*/abiFilters "arm64-v8a"/'
-e '/^repositories {/a mavenLocal()' build.gradle
- sed -i -e 's/org.maplibre.gl/org.fdroid/' build.gradle $$maplibre-gl-native$$/platform/android/gradle/artifact-settings.gradle
- cd $$maplibre-gl-native$$/platform/android/MapboxGLAndroidSDK
- sed -i -e '/signing {/,/}/d' -e '/signing/d' ../gradle/gradle-publish.gradle
- sed -i -e '/gmsLocation/d' build.gradle
- cd src/main/java/com/mapbox/mapboxsdk/location/engine
- sed -i -e '/isOnClasspath(GOOGLE_API_AVAILABILITY)/,/}/d' -e '/import.*gms/d'
-e 's|return isGoogle|return //isGoogle|' LocationEngineProvider.java
- rm GoogleLocationEngineImpl.java
- sed -i -e '/private.*extractGooglePlayResult/,/^ }/d' -e '/extractGooglePlayResult/d'
-e '/import.*gms/d' LocationEngineResult.java
prebuild: sed -i -e '/versionCode/s/$/2/' -e 's/abiFilters .*/abiFilters "arm64-v8a"/'
build.gradle
build:
- pushd $$maplibre-gl-native$$/platform/android
- git submodule update --init --recursive
- export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
- BUILDTYPE=Release make android-lib-arm-v8
- gradle -Pmapbox.abis=arm64-v8a -PVERSION_NAME=9.5.2 :MapboxGLAndroidSDK:assembleRelease
:MapboxGLAndroidSDK:publishToMavenLocal
- popd
- $$rustup$$/rustup-init.sh -y --default-toolchain $(cat scripts/rust-toolchain)
--target aarch64-linux-android
- source $HOME/.cargo/env
- sdkmanager "ndk;23.2.8568313"
- export PATH=$PATH:$$SDK$$/ndk/23.2.8568313/toolchains/llvm/prebuilt/linux-x86_64/bin/
- ANDROID_NDK_ROOT=$$SDK$$/ndk/23.2.8568313/ scripts/ndk-make.sh arm64-v8a
ndk: r20
- PATH=$PATH:$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/ ANDROID_NDK_ROOT=$$NDK$$
scripts/ndk-make.sh armeabi-v7a
ndk: r23c
- versionName: 1.46.3
versionCode: 6863
@ -3638,43 +3594,21 @@ Builds:
timeout: 20000
submodules: true
sudo:
- echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list
- apt-get update
- apt-get install -y make g++ cmake
- apt-get install -y -t bullseye openjdk-11-jdk-headless
gradle:
- fat
srclibs:
- rustup@1.25.1
- maplibre-gl-native@android-v9.5.2
prebuild:
- sed -i -e '/versionCode/s/$/3/' -e 's/abiFilters .*/abiFilters "x86"/' -e
'/^repositories {/a mavenLocal()' build.gradle
- sed -i -e 's/org.maplibre.gl/org.fdroid/' build.gradle $$maplibre-gl-native$$/platform/android/gradle/artifact-settings.gradle
- cd $$maplibre-gl-native$$/platform/android/MapboxGLAndroidSDK
- sed -i -e '/signing {/,/}/d' -e '/signing/d' ../gradle/gradle-publish.gradle
- sed -i -e '/gmsLocation/d' build.gradle
- cd src/main/java/com/mapbox/mapboxsdk/location/engine
- sed -i -e '/isOnClasspath(GOOGLE_API_AVAILABILITY)/,/}/d' -e '/import.*gms/d'
-e 's|return isGoogle|return //isGoogle|' LocationEngineProvider.java
- rm GoogleLocationEngineImpl.java
- sed -i -e '/private.*extractGooglePlayResult/,/^ }/d' -e '/extractGooglePlayResult/d'
-e '/import.*gms/d' LocationEngineResult.java
prebuild: sed -i -e '/versionCode/s/$/3/' -e 's/abiFilters .*/abiFilters "x86"/'
build.gradle
build:
- pushd $$maplibre-gl-native$$/platform/android
- git submodule update --init --recursive
- export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
- BUILDTYPE=Release make android-lib-x86
- gradle -Pmapbox.abis=x86 -PVERSION_NAME=9.5.2 :MapboxGLAndroidSDK:assembleRelease
:MapboxGLAndroidSDK:publishToMavenLocal
- popd
- $$rustup$$/rustup-init.sh -y --default-toolchain $(cat scripts/rust-toolchain)
--target i686-linux-android
- source $HOME/.cargo/env
- sdkmanager "ndk;23.2.8568313"
- export PATH=$PATH:$$SDK$$/ndk/23.2.8568313/toolchains/llvm/prebuilt/linux-x86_64/bin/
- ANDROID_NDK_ROOT=$$SDK$$/ndk/23.2.8568313/ scripts/ndk-make.sh x86
ndk: r20
- PATH=$PATH:$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/ ANDROID_NDK_ROOT=$$NDK$$
scripts/ndk-make.sh armeabi-v7a
ndk: r23c
- versionName: 1.46.3
versionCode: 6864
@ -3682,43 +3616,21 @@ Builds:
timeout: 20000
submodules: true
sudo:
- echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list
- apt-get update
- apt-get install -y make g++ cmake
- apt-get install -y -t bullseye openjdk-11-jdk-headless
gradle:
- fat
srclibs:
- rustup@1.25.1
- maplibre-gl-native@android-v9.5.2
prebuild:
- sed -i -e '/versionCode/s/$/4/' -e 's/abiFilters .*/abiFilters "x86_64"/'
-e '/^repositories {/a mavenLocal()' build.gradle
- sed -i -e 's/org.maplibre.gl/org.fdroid/' build.gradle $$maplibre-gl-native$$/platform/android/gradle/artifact-settings.gradle
- cd $$maplibre-gl-native$$/platform/android/MapboxGLAndroidSDK
- sed -i -e '/signing {/,/}/d' -e '/signing/d' ../gradle/gradle-publish.gradle
- sed -i -e '/gmsLocation/d' build.gradle
- cd src/main/java/com/mapbox/mapboxsdk/location/engine
- sed -i -e '/isOnClasspath(GOOGLE_API_AVAILABILITY)/,/}/d' -e '/import.*gms/d'
-e 's|return isGoogle|return //isGoogle|' LocationEngineProvider.java
- rm GoogleLocationEngineImpl.java
- sed -i -e '/private.*extractGooglePlayResult/,/^ }/d' -e '/extractGooglePlayResult/d'
-e '/import.*gms/d' LocationEngineResult.java
prebuild: sed -i -e '/versionCode/s/$/4/' -e 's/abiFilters .*/abiFilters "x86_64"/'
build.gradle
build:
- pushd $$maplibre-gl-native$$/platform/android
- git submodule update --init --recursive
- export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
- BUILDTYPE=Release make android-lib-x86-64
- gradle -Pmapbox.abis=x86_64 -PVERSION_NAME=9.5.2 :MapboxGLAndroidSDK:assembleRelease
:MapboxGLAndroidSDK:publishToMavenLocal
- popd
- $$rustup$$/rustup-init.sh -y --default-toolchain $(cat scripts/rust-toolchain)
--target x86_64-linux-android
- source $HOME/.cargo/env
- sdkmanager "ndk;23.2.8568313"
- export PATH=$PATH:$$SDK$$/ndk/23.2.8568313/toolchains/llvm/prebuilt/linux-x86_64/bin/
- ANDROID_NDK_ROOT=$$SDK$$/ndk/23.2.8568313/ scripts/ndk-make.sh x86_64
ndk: r20
- PATH=$PATH:$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/ ANDROID_NDK_ROOT=$$NDK$$
scripts/ndk-make.sh armeabi-v7a
ndk: r23c
AutoUpdateMode: Version
UpdateCheckMode: Tags ^v[\d.]+$

View file

@ -569,13 +569,6 @@ Builds:
gradle:
- yes
- versionName: 0.0.68
versionCode: 68
commit: 8232eb6fc6c12d36549ff066c57a4d454f69d075
subdir: app
gradle:
- yes
- versionName: 0.0.69
versionCode: 69
commit: f3bacd8e2a9037c2b30d869413686894ea429961

View file

@ -115,6 +115,7 @@ Builds:
- versionName: 1.5.0
versionCode: 20
disable: https://github.com/lolo-io/OneList/issues/87
commit: 49e5c89cc004c9f0166e1612dcee58d9ffc3d801
subdir: app
gradle:

View file

@ -9238,6 +9238,7 @@ Builds:
- node_modules/react-native-math-view/android/build.gradle
- node_modules/react-native-navigation/lib/android/build.gradle
- node_modules/react-native-notifications/lib/android/build.gradle
- node_modules/react-native-performance/android/build.gradle
- node_modules/react-native-permissions/android/build.gradle
- node_modules/react-native-reanimated/android/build.gradle
- node_modules/react-native-safe-area-context/android/build.gradle
@ -9255,7 +9256,6 @@ Builds:
- node scripts/generate-assets.js
- ./node_modules/.bin/jetify
- popd
ndk: 23.1.7779620
gradleprops:
- separateApk=true
- reactNativeArchitectures=armeabi-v7a
@ -9327,6 +9327,7 @@ Builds:
- node_modules/react-native-math-view/android/build.gradle
- node_modules/react-native-navigation/lib/android/build.gradle
- node_modules/react-native-notifications/lib/android/build.gradle
- node_modules/react-native-performance/android/build.gradle
- node_modules/react-native-permissions/android/build.gradle
- node_modules/react-native-reanimated/android/build.gradle
- node_modules/react-native-safe-area-context/android/build.gradle
@ -9344,7 +9345,6 @@ Builds:
- node scripts/generate-assets.js
- ./node_modules/.bin/jetify
- popd
ndk: 23.1.7779620
gradleprops:
- separateApk=true
- reactNativeArchitectures=x86
@ -9416,6 +9416,7 @@ Builds:
- node_modules/react-native-math-view/android/build.gradle
- node_modules/react-native-navigation/lib/android/build.gradle
- node_modules/react-native-notifications/lib/android/build.gradle
- node_modules/react-native-performance/android/build.gradle
- node_modules/react-native-permissions/android/build.gradle
- node_modules/react-native-reanimated/android/build.gradle
- node_modules/react-native-safe-area-context/android/build.gradle
@ -9433,7 +9434,6 @@ Builds:
- node scripts/generate-assets.js
- ./node_modules/.bin/jetify
- popd
ndk: 23.1.7779620
gradleprops:
- separateApk=true
- reactNativeArchitectures=arm64-v8a
@ -9505,6 +9505,7 @@ Builds:
- node_modules/react-native-math-view/android/build.gradle
- node_modules/react-native-navigation/lib/android/build.gradle
- node_modules/react-native-notifications/lib/android/build.gradle
- node_modules/react-native-performance/android/build.gradle
- node_modules/react-native-permissions/android/build.gradle
- node_modules/react-native-reanimated/android/build.gradle
- node_modules/react-native-safe-area-context/android/build.gradle
@ -9522,7 +9523,6 @@ Builds:
- node scripts/generate-assets.js
- ./node_modules/.bin/jetify
- popd
ndk: 23.1.7779620
gradleprops:
- separateApk=true
- reactNativeArchitectures=x86_64

View file

@ -13802,21 +13802,6 @@ Builds:
scandelete:
- app/src/androidTest/assets
- versionName: '20240614'
versionCode: 20240614
commit: ea0e579b5673e454b7cbab61b93045c6547cd58e
subdir: app
gradle:
- versionDev
rm:
- user_manual
prebuild:
- mkdir -p $HOME/.gradle
- echo "org.gradle.jvmargs=-Xmx9g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError"
> $HOME/.gradle/gradle.properties
scandelete:
- app/src/androidTest/assets
- versionName: '20240615'
versionCode: 20240615
commit: 44b592a654e7accc078dbdc07bf48413002deada

View file

@ -7471,17 +7471,6 @@ Builds:
scandelete:
- app/lib
- versionName: '1.2201'
versionCode: 2201
commit: a95cb19169305b0171dacaef0ff355777d1edefa
subdir: app
submodules: true
gradle:
- fdroid
prebuild: sdkmanager 'cmake;3.22.1'
scandelete:
- app/lib
- versionName: '1.2204'
versionCode: 2204
commit: acb6792daffbacfc57a16940e00493380b4618a6

View file

@ -127,6 +127,7 @@ Builds:
- versionName: 2.0.6
versionCode: 2060
disable: https://github.com/syt0r/Kanji-Dojo/issues/150
commit: 5698328a51bd3b8194eeefbe5a15ca8b74d70adc
subdir: app
gradle: