From 5d943c4ff593d423b1eca1f80ec9cc2d16f1767a Mon Sep 17 00:00:00 2001 From: linsui Date: Wed, 16 Nov 2022 11:56:40 +0800 Subject: [PATCH] deltachat: split abi --- metadata/com.b44t.messenger.yml | 155 +++++++++++++++++++++++++++++--- 1 file changed, 144 insertions(+), 11 deletions(-) diff --git a/metadata/com.b44t.messenger.yml b/metadata/com.b44t.messenger.yml index ce98d398e6..bbffc90519 100644 --- a/metadata/com.b44t.messenger.yml +++ b/metadata/com.b44t.messenger.yml @@ -1397,10 +1397,9 @@ Builds: - ANDROID_NDK_ROOT=$$NDK$$ ./ndk-make.sh ndk: r21b - - versionName: 1.34.4 - versionCode: 641 - disable: https://github.com/deltachat/deltachat-android/issues/2426 - commit: ae0be1302c9c0ec706a5ae1644807b963312f7e8 + - versionName: 1.34.5 + versionCode: 6421 + commit: 4d22d91e98256bcd0290e47c8c46d195565a721b timeout: 20000 submodules: true sudo: @@ -1414,7 +1413,8 @@ Builds: - rustup@1.25.1 - maplibre-gl-native@android-v9.5.2 prebuild: - - sed -i -e '/applicationIdSuffix/d' -e '/^repositories {/a mavenLocal()' build.gradle + - 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 @@ -1428,17 +1428,150 @@ Builds: build: - pushd $$maplibre-gl-native$$/platform/android - git submodule update --init --recursive - - BUILDTYPE=Release make apackage - - gradle -Pmapbox.abis=all -PVERSION_NAME=9.5.2 :MapboxGLAndroidSDK:publishToMavenLocal + - BUILDTYPE=Release make android-lib-arm-v7 + - gradle -Pmapbox.abis=armeabi-v7a -PVERSION_NAME=9.5.2 :MapboxGLAndroidSDK:assembleRelease + :MapboxGLAndroidSDK:publishToMavenLocal - popd - $$rustup$$/rustup-init.sh -y - source $HOME/.cargo/env - scripts/install-toolchains.sh - export PATH=$PATH:$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/ - - ANDROID_NDK_ROOT=$$NDK$$ ./ndk-make.sh + - ANDROID_NDK_ROOT=$$NDK$$ scripts/ndk-make.sh armeabi-v7a ndk: r21b + - versionName: 1.34.5 + versionCode: 6422 + commit: 4d22d91e98256bcd0290e47c8c46d195565a721b + timeout: 20000 + submodules: true + sudo: + - cd /opt/android-sdk/ndk + - rm -fr $(ls | sed 's/21.1.6352462//') + - apt-get update + - apt-get install -y make g++ cmake + 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 + build: + - pushd $$maplibre-gl-native$$/platform/android + - git submodule update --init --recursive + - 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 + - source $HOME/.cargo/env + - scripts/install-toolchains.sh + - export PATH=$PATH:$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/ + - ANDROID_NDK_ROOT=$$NDK$$ scripts/ndk-make.sh arm64-v8a + ndk: r21b + + - versionName: 1.34.5 + versionCode: 6423 + commit: 4d22d91e98256bcd0290e47c8c46d195565a721b + timeout: 20000 + submodules: true + sudo: + - cd /opt/android-sdk/ndk + - rm -fr $(ls | sed 's/21.1.6352462//') + - apt-get update + - apt-get install -y make g++ cmake + 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 + build: + - pushd $$maplibre-gl-native$$/platform/android + - git submodule update --init --recursive + - 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 + - source $HOME/.cargo/env + - scripts/install-toolchains.sh + - export PATH=$PATH:$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/ + - ANDROID_NDK_ROOT=$$NDK$$ scripts/ndk-make.sh x86 + ndk: r21b + + - versionName: 1.34.5 + versionCode: 6424 + commit: 4d22d91e98256bcd0290e47c8c46d195565a721b + timeout: 20000 + submodules: true + sudo: + - cd /opt/android-sdk/ndk + - rm -fr $(ls | sed 's/21.1.6352462//') + - apt-get update + - apt-get install -y make g++ cmake + 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 + build: + - pushd $$maplibre-gl-native$$/platform/android + - git submodule update --init --recursive + - 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 + - source $HOME/.cargo/env + - scripts/install-toolchains.sh + - export PATH=$PATH:$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/ + - ANDROID_NDK_ROOT=$$NDK$$ scripts/ndk-make.sh x86_64 + ndk: r21b + +ArchivePolicy: 12 versions AutoUpdateMode: Version -UpdateCheckMode: Tags ^v[0-9]+\.[0-9]+\.[0-9]+$ -CurrentVersion: 1.34.4 -CurrentVersionCode: 641 +UpdateCheckMode: Tags ^v[\d.]+$ +VercodeOperation: + - 10 * %c + 1 + - 10 * %c + 2 + - 10 * %c + 3 + - 10 * %c + 4 +CurrentVersion: 1.34.5 +CurrentVersionCode: 6424