Merge pull request #8383 from vector-im/feature/bma/jitsi8
Upgrade jitsi to version 8.1.1
This commit is contained in:
Benoit Marty
GitHub
commit
6c80a38c4a
|
|
@ -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 }
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
Upgrade Jitsi SDK from 6.2.2 to 8.1.1. This fixes video call on some Android devices.
|
||||
|
|
@ -203,6 +203,7 @@ ext.groups = [
|
|||
'org.jetbrains.kotlin',
|
||||
'org.jetbrains.kotlinx',
|
||||
'org.jetbrains.trove4j',
|
||||
'org.jitsi',
|
||||
'org.json',
|
||||
'org.jsoup',
|
||||
'org.junit',
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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 "##################################################"
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
|
|
|||
|
|
@ -475,8 +475,8 @@ class DefaultNavigator @Inject constructor(
|
|||
|
||||
override fun openRoomWidget(context: Context, roomId: String, widget: Widget, options: Map<String, Any>?) {
|
||||
if (widget.type is WidgetType.Jitsi) {
|
||||
// Jitsi SDK is now for API 23+
|
||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
|
||||
// Jitsi SDK is now for API 24+
|
||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
|
||||
MaterialAlertDialogBuilder(context)
|
||||
.setTitle(R.string.dialog_title_error)
|
||||
.setMessage(R.string.error_jitsi_not_supported_on_old_device)
|
||||
|
|
|
|||
Loading…
Reference in New Issue