Update Element to 1.5.6

This commit is contained in:
Sylvia van Os 2022-11-03 19:53:52 +00:00 committed by Licaon_Kter
parent e57501858f
commit 1fd083af72
2 changed files with 77 additions and 2 deletions

View file

@ -1158,6 +1158,62 @@ Builds:
- cp -r node_modules/jsc-android/dist/org/webkit/android-jsc "$HOME/.m2/repository/org/webkit"
ndk: r21d
- versionName: 1.5.6
versionCode: 40105060
commit: 3b2718951b4942b14a2144b5170dc96cc7d7affa
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_40105060.patch
gradle:
- fdroid
srclibs:
- jitsi-meet@android-sdk-6.2.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
@ -1166,5 +1222,5 @@ MaintainerNotes: Do not update unless requested by the Element team! The Element
AutoUpdateMode: None
UpdateCheckMode: None
CurrentVersion: 1.5.4
CurrentVersionCode: 40105040
CurrentVersion: 1.5.6
CurrentVersionCode: 40105060

View file

@ -0,0 +1,19 @@
--- a/build.gradle
+++ b/build.gradle
@@ -94,16 +94,6 @@ allprojects {
groups.jitpack.group.each { includeGroup it }
}
}
- // Jitsi repo
- maven {
- url "https://github.com/vector-im/jitsi_libre_maven/raw/main/android-sdk-6.2.2"
- // Note: to test Jitsi release you can use a local file like this:
- // url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-6.2.2"
- content {
- groups.jitsi.regex.each { includeGroupByRegex it }
- groups.jitsi.group.each { includeGroup it }
- }
- }
// Do not use `google()`, it prevents Dependabot from working properly
maven {
url 'https://maven.google.com'