From 4aab1ad8f70253676c2b90456391da66761c6e93 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 18 Sep 2024 16:41:30 +0200 Subject: [PATCH 1/2] Use Jitsi SDK 10.2.0 --- build.gradle | 4 ++-- dependencies_groups.gradle | 1 + docs/jitsi.md | 14 ++++---------- tools/jitsi/build_jisti_libs.sh | 2 +- vector/build.gradle | 5 ++++- vector/src/main/AndroidManifest.xml | 2 +- 6 files changed, 13 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index af6aa5e91b..2e4b5b5817 100644 --- a/build.gradle +++ b/build.gradle @@ -96,9 +96,9 @@ allprojects { } // Jitsi repo maven { - url "https://github.com/element-hq/jitsi_libre_maven/raw/main/android-sdk-8.1.1" + url "https://github.com/element-hq/jitsi_libre_maven/raw/main/mobile-sdk-10.2.0" // Note: to test Jitsi release you can use a local file like this: - // url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-8.1.1" + // url "file:///Users/bmarty/workspaces/jitsi_libre_maven/mobile-sdk-10.2.0" content { groups.jitsi.regex.each { includeGroupByRegex it } groups.jitsi.group.each { includeGroup it } diff --git a/dependencies_groups.gradle b/dependencies_groups.gradle index 0c76f0f3b9..4b69468e06 100644 --- a/dependencies_groups.gradle +++ b/dependencies_groups.gradle @@ -72,6 +72,7 @@ ext.groups = [ 'com.facebook.flipper', 'com.facebook.fresco', 'com.facebook.infer.annotation', + 'com.facebook.react', 'com.facebook.soloader', 'com.facebook.stetho', 'com.facebook.yoga', diff --git a/docs/jitsi.md b/docs/jitsi.md index b413d93dfc..0b3a5d985b 100644 --- a/docs/jitsi.md +++ b/docs/jitsi.md @@ -32,7 +32,7 @@ Update the script `./tools/jitsi/build_jisti_libs.sh` with the tag of the projec Latest tag can be found from this page: https://github.com/jitsi/jitsi-meet-release-notes/blob/master/CHANGELOG-MOBILE-SDKS.md -Currently we are building the version with the tag `android-sdk-8.1.1`. +Currently we are building the version with the tag `mobile-sdk-10.2.0`. #### Run the build script @@ -49,7 +49,7 @@ It will build the Jitsi Meet Android library and put every generated files in th - Update the file `./build.gradle` to use the previously created local Maven repository. Currently we have this line: ```groovy -url "https://github.com/element-hq/jitsi_libre_maven/raw/main/android-sdk-8.1.1" +url "https://github.com/element-hq/jitsi_libre_maven/raw/main/mobile-sdk-10.2.0" ``` You can uncomment and update the line starting with `// url "file://...` and comment the line starting with `url`, to test the library using the locally generated Maven repository. @@ -57,13 +57,7 @@ You can uncomment and update the line starting with `// url "file://...` and com - Update the dependency of the Jitsi Meet library in the file `./vector/build.gradle`. Currently we have this line: ```groovy -api('org.jitsi.react:jitsi-meet-sdk:8.1.1') -``` - -- Update the dependency of the WebRTC library in the file `./vector/build.gradle`. Currently we have this line: - -```groovy -implementation('com.facebook.react:react-native-webrtc:111.0.0-jitsi-13672566@aar') +api('org.jitsi.react:jitsi-meet-sdk:10.2.0') ``` - Perform a gradle sync and build the project @@ -88,7 +82,7 @@ If all the tests are passed, you can export the generated Jitsi library to our M - Update the file `./build.gradle` to use the previously created Maven repository. Currently we have this line: ```groovy -url "https://github.com/element-hq/jitsi_libre_maven/raw/main/android-sdk-8.1.1" +url "https://github.com/element-hq/jitsi_libre_maven/raw/main/mobile-sdk-10.2.0" ``` - Build the project and perform the sanity tests again. diff --git a/tools/jitsi/build_jisti_libs.sh b/tools/jitsi/build_jisti_libs.sh index fcdf728428..d0c6aeb54a 100755 --- a/tools/jitsi/build_jisti_libs.sh +++ b/tools/jitsi/build_jisti_libs.sh @@ -26,7 +26,7 @@ export LIBRE_BUILD=true cd jitsi-meet # Get the latest version from the changelog: https://github.com/jitsi/jitsi-meet-release-notes/blob/master/CHANGELOG-MOBILE-SDKS.md -git checkout android-sdk-8.1.1 +git checkout mobile-sdk-10.2.0 echo echo "##################################################" diff --git a/vector/build.gradle b/vector/build.gradle index 1374b236f9..8a64fe0861 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -250,7 +250,7 @@ dependencies { implementation "androidx.emoji2:emoji2:1.3.0" // Jitsi - api('org.jitsi.react:jitsi-meet-sdk:8.1.1') { + api('org.jitsi.react:jitsi-meet-sdk:10.2.0') { exclude group: 'com.google.firebase' exclude group: 'com.google.android.gms' exclude group: 'com.android.installreferrer' @@ -259,6 +259,9 @@ dependencies { // The library exports a jetified artifact but doesn't remove the support library dependency // https://github.com/MatrixFrog/Android-ScalableVideoView/blob/master/gradle.properties#L1 exclude group: 'com.android.support', module: 'appcompat-v7' + + // transitive needed to pull in the react-native dependency + transitive = true } // QR-code diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml index d843f03216..d13037b4a9 100644 --- a/vector/src/main/AndroidManifest.xml +++ b/vector/src/main/AndroidManifest.xml @@ -54,7 +54,7 @@ - + From da94bb8ffa3a6560f4a05a2beaaf5db92a57413a Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 18 Sep 2024 16:54:43 +0200 Subject: [PATCH 2/2] Fix typo in script name. --- docs/jitsi.md | 4 ++-- tools/jitsi/{build_jisti_libs.sh => build_jitsi_libs.sh} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename tools/jitsi/{build_jisti_libs.sh => build_jitsi_libs.sh} (100%) diff --git a/docs/jitsi.md b/docs/jitsi.md index 0b3a5d985b..d962b1e8a3 100644 --- a/docs/jitsi.md +++ b/docs/jitsi.md @@ -28,7 +28,7 @@ The generated maven repository is then host in the project https://github.com/el #### Jitsi version -Update the script `./tools/jitsi/build_jisti_libs.sh` with the tag of the project `https://github.com/jitsi/jitsi-meet`. +Update the script `./tools/jitsi/build_jitsi_libs.sh` with the tag of the project `https://github.com/jitsi/jitsi-meet`. Latest tag can be found from this page: https://github.com/jitsi/jitsi-meet-release-notes/blob/master/CHANGELOG-MOBILE-SDKS.md @@ -39,7 +39,7 @@ Currently we are building the version with the tag `mobile-sdk-10.2.0`. At the root of the Element Android, run the following script: ```shell script -./tools/jitsi/build_jisti_libs.sh +./tools/jitsi/build_jitsi_libs.sh ``` It will build the Jitsi Meet Android library and put every generated files in the folder `/tmp/jitsi` diff --git a/tools/jitsi/build_jisti_libs.sh b/tools/jitsi/build_jitsi_libs.sh similarity index 100% rename from tools/jitsi/build_jisti_libs.sh rename to tools/jitsi/build_jitsi_libs.sh