From f7fc4c5ef259eb5e4fc7640972428a6474ee8917 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Mon, 24 Oct 2022 17:17:46 +0000
Subject: [PATCH] Update Element to 1.5.4

---
 metadata/im.vector.app.yml | 60 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 58 insertions(+), 2 deletions(-)

diff --git a/metadata/im.vector.app.yml b/metadata/im.vector.app.yml
index d532a74fbb..2b7af6e70d 100644
--- a/metadata/im.vector.app.yml
+++ b/metadata/im.vector.app.yml
@@ -1102,6 +1102,62 @@ Builds:
       - cp -r node_modules/jsc-android/dist/org/webkit/android-jsc "$HOME/.m2/repository/org/webkit"
     ndk: r21d
 
+  - versionName: 1.5.4
+    versionCode: 40105040
+    commit: db35f5c7f2a33a13217ecc069989df74ab6db375
+    subdir: vector-app
+    sudo:
+      - apt-get update
+      - apt-get install -y jq libopus0 make g++ cmake maven
+      - curl -Lo node.tar.gz https://nodejs.org/dist/v16.17.1/node-v16.17.1-linux-x64.tar.gz
+      - echo "da5658693243b3ecf6a4cba6751a71df1eb9e9703ca93b42a9404aed85f58ad0 node.tar.gz"
+        | sha256sum -c -
+      - tar xzf node.tar.gz --strip-components=1 -C /usr/local/
+      - sysctl fs.inotify.max_user_watches=524288 || true
+      - cd /opt/android-sdk/ndk
+      - rm -fr $(ls | sed 's/21.3.6528147//')
+    patch:
+      - build_gradle_remove_jitsi_repo_40104160.patch
+    gradle:
+      - fdroid
+    srclibs:
+      - jitsi-meet@android-sdk-5.0.2
+      - maplibre-gl-native@android-v9.5.2
+    prebuild:
+      - sed -i -e 's/def isCiBuild =.*/def isCiBuild = true/' ../tools/gradle/doctor.gradle
+      - 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
+      - pushd $$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
+      - popd
+      - sed -i -e '/com.google.gms.google-services/d' build.gradle ../build.gradle
+      - sed -i -e 's/enable true/enable false/g' -e '/firebase.appdistribution/d'
+        -e '/AppDistribution {/,/}/d' build.gradle
+      - sed -i -e '/repositories {/a\        mavenLocal()' -e '/firebase/d' ../build.gradle
+      - sed -i -e '/gplayImplementation(.*) {/,/}/d; /gplayImplementation/d' build.gradle
+    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
+      - popd
+      - cd $$jitsi-meet$$
+      - export LIBRE_BUILD=true
+      - npm install --save false webpack-bundle-analyzer
+      - npm ci
+      - mkdir -p "$HOME/.m2"
+      - bash android/scripts/release-sdk.sh "$HOME/.m2/repository"
+      - mkdir -p "$HOME/.m2/repository/org/webkit"
+      - cp -r node_modules/jsc-android/dist/org/webkit/android-jsc "$HOME/.m2/repository/org/webkit"
+    ndk: r21d
+
 MaintainerNotes: Do not update unless requested by the Element team! The Element team
     will ping us whenever they feel a new release is ready. See https://github.com/vector-im/element-android/issues/3728
     as an example of their release process. AntiFeature NonFreeNet is added because
@@ -1110,5 +1166,5 @@ MaintainerNotes: Do not update unless requested by the Element team! The Element
 
 AutoUpdateMode: None
 UpdateCheckMode: None
-CurrentVersion: 1.5.2
-CurrentVersionCode: 40105020
+CurrentVersion: 1.5.4
+CurrentVersionCode: 40105040