From 48f4ad412f225daaedaa5e3620328152004c6c1d Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 2 May 2023 14:29:41 +0200 Subject: [PATCH] Jitsi 8.1.1 --- build.gradle | 4 ++-- docs/jitsi.md | 10 +++++----- tools/jitsi/build_jisti_libs.sh | 2 +- vector/build.gradle | 5 ++--- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 69c626afd3..04628a3cf0 100644 --- a/build.gradle +++ b/build.gradle @@ -96,9 +96,9 @@ allprojects { } // Jitsi repo maven { - url "https://github.com/vector-im/jitsi_libre_maven/raw/main/android-sdk-6.2.2" + url "https://github.com/vector-im/jitsi_libre_maven/raw/main/android-sdk-8.1.1" // 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" + // url "file:///Users/bmarty/workspaces/jitsi_libre_maven/android-sdk-8.1.1" content { groups.jitsi.regex.each { includeGroupByRegex it } groups.jitsi.group.each { includeGroup it } diff --git a/docs/jitsi.md b/docs/jitsi.md index d6c93c49aa..9116cbcb2c 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-3.10.0`. +Currently we are building the version with the tag `android-sdk-8.1.1`. #### 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/vector-im/jitsi_libre_maven/raw/master/android-sdk-3.10.0" +url "https://github.com/vector-im/jitsi_libre_maven/raw/main/android-sdk-8.1.1" ``` 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,13 @@ 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 -implementation('org.jitsi.react:jitsi-meet-sdk:3.10.0') +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:1.92.1-jitsi-9093212@aar') +implementation('com.facebook.react:react-native-webrtc:111.0.0-jitsi-13672566@aar') ``` - Perform a gradle sync and build the project @@ -88,7 +88,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/vector-im/jitsi_libre_maven/raw/master/android-sdk-3.10.0" +url "https://github.com/vector-im/jitsi_libre_maven/raw/main/android-sdk-8.1.1" ``` - 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 91c32fc597..28c777ac09 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-6.2.2 +git checkout android-sdk-8.1.1 echo echo "##################################################" diff --git a/vector/build.gradle b/vector/build.gradle index eba81b29e9..6687bea051 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -249,10 +249,9 @@ dependencies { // WebRTC // org.webrtc:google-webrtc is for development purposes only // implementation 'org.webrtc:google-webrtc:1.0.+' - implementation('com.facebook.react:react-native-webrtc:1.106.1-jitsi-12039821@aar') + implementation('com.facebook.react:react-native-webrtc:111.0.0-jitsi-13672566@aar') // Jitsi - // Note: version is 6.2.0, but built from the tag `android-sdk-6.2.2`. - api('org.jitsi.react:jitsi-meet-sdk:6.2.0') { + api('org.jitsi.react:jitsi-meet-sdk:8.1.1') { exclude group: 'com.google.firebase' exclude group: 'com.google.android.gms' exclude group: 'com.android.installreferrer'