Deltachat: fix maplibre

metadata/com.b44t.messenger.yml

@@ -1276,10 +1276,9 @@ Builds:
       - ./ndk-make.sh
     ndk: r20b
 
-  - versionName: 1.30.2
-    versionCode: 631
-    disable: https://github.com/deltachat/deltachat-android/issues/2349
-    commit: 4664e51754079cf813e1f3b11848e3bd1f280b26
+  - versionName: 1.32.0
+    versionCode: 635
+    commit: ee5e7a0dfb1f9719cdd1294a446d4b9adcc76ade
     timeout: 20000
     submodules: true
     sudo:
@@ -1289,76 +1288,34 @@ Builds:
     gradle:
       - fat
     srclibs:
-      - rustup@1.21.1
-    prebuild: sed -i -e '/applicationIdSuffix/d' build.gradle
+      - 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 '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:
-      - cd jni/deltachat-core-rust
+      - 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
+      - popd
       - $$rustup$$/rustup-init.sh -y
-      - export PATH=$PATH:$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/
       - source $HOME/.cargo/env
-      - rustup default $(cat rust-toolchain)
-      - rustup target add aarch64-linux-android
-      - echo "[target.aarch64-linux-android]" > $HOME/.cargo/config
-      - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang"'
-        >> $HOME/.cargo/config
-      - rustup target add i686-linux-android
-      - echo "[target.i686-linux-android]" >> $HOME/.cargo/config
-      - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android18-clang"'
-        >> $HOME/.cargo/config
-      - rustup target add armv7-linux-androideabi
-      - echo "[target.armv7-linux-androideabi]" >> $HOME/.cargo/config
-      - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi18-clang"'
-        >> $HOME/.cargo/config
-      - rustup target add x86_64-linux-android
-      - echo "[target.x86_64-linux-android]" >> $HOME/.cargo/config
-      - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang"'
-        >> $HOME/.cargo/config
-      - cd ../..
-      - ./ndk-make.sh
-    ndk: r20b
-
-  - versionName: 1.30.3
-    versionCode: 632
-    disable: https://github.com/deltachat/deltachat-android/issues/2349
-    commit: cc4b13e9246ee4af999276b3dac0fafd81f08d2f
-    timeout: 20000
-    submodules: true
-    sudo:
-      - apt-get update || apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
-    gradle:
-      - fat
-    srclibs:
-      - rustup@1.21.1
-    prebuild: sed -i -e '/applicationIdSuffix/d' build.gradle
-    build:
-      - cd jni/deltachat-core-rust
-      - $$rustup$$/rustup-init.sh -y
+      - scripts/install-toolchains.sh
       - export PATH=$PATH:$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/
-      - source $HOME/.cargo/env
-      - rustup default $(cat rust-toolchain)
-      - rustup target add aarch64-linux-android
-      - echo "[target.aarch64-linux-android]" > $HOME/.cargo/config
-      - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang"'
-        >> $HOME/.cargo/config
-      - rustup target add i686-linux-android
-      - echo "[target.i686-linux-android]" >> $HOME/.cargo/config
-      - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android18-clang"'
-        >> $HOME/.cargo/config
-      - rustup target add armv7-linux-androideabi
-      - echo "[target.armv7-linux-androideabi]" >> $HOME/.cargo/config
-      - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi18-clang"'
-        >> $HOME/.cargo/config
-      - rustup target add x86_64-linux-android
-      - echo "[target.x86_64-linux-android]" >> $HOME/.cargo/config
-      - echo 'linker = "$$NDK$$/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang"'
-        >> $HOME/.cargo/config
-      - cd ../..
-      - ./ndk-make.sh
-    ndk: r20b
+      - ANDROID_NDK_ROOT=$$NDK$$ ./ndk-make.sh
+    ndk: r21b
 
-AutoUpdateMode: None
+AutoUpdateMode: Version
 UpdateCheckMode: Tags ^v[0-9]+\.[0-9]+\.[0-9]+$
 CurrentVersion: 1.32.0
 CurrentVersionCode: 635

srclibs/maplibre-gl-native.yml

@@ -0,0 +1,2 @@
+RepoType: git
+Repo: https://github.com/maplibre/maplibre-gl-native.git