diff --git a/build.gradle b/build.gradle index 49cdb73516e..419aa9a0b7a 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/mobile-sdk-11.4.0" + url "https://github.com/element-hq/jitsi_libre_maven/raw/main/mobile-sdk-11.5.1" // Note: to test Jitsi release you can use a local file like this: - // url "file:///Users/bmarty/workspaces/jitsi_libre_maven/mobile-sdk-10.2.0" + // url "file:///Users/bmarty/workspaces/jitsi_libre_maven/mobile-sdk-11.5.1" content { groups.jitsi.regex.each { includeGroupByRegex it } groups.jitsi.group.each { includeGroup it } diff --git a/changelog.d/9124.misc b/changelog.d/9124.misc new file mode 100644 index 00000000000..40ff55b698e --- /dev/null +++ b/changelog.d/9124.misc @@ -0,0 +1 @@ +Bump `jitsi_modile_sdk` to v11.5.1 diff --git a/docs/jitsi.md b/docs/jitsi.md index d962b1e8a3d..dd0b4dd4683 100644 --- a/docs/jitsi.md +++ b/docs/jitsi.md @@ -32,7 +32,7 @@ Update the script `./tools/jitsi/build_jitsi_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 `mobile-sdk-10.2.0`. +Currently we are building the version with the tag `mobile-sdk-11.5.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/element-hq/jitsi_libre_maven/raw/main/mobile-sdk-10.2.0" +url "https://github.com/element-hq/jitsi_libre_maven/raw/main/mobile-sdk-11.5.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,7 +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:10.2.0') +api('org.jitsi.react:jitsi-meet-sdk:11.5.1') ``` - Perform a gradle sync and build the project @@ -82,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/mobile-sdk-10.2.0" +url "https://github.com/element-hq/jitsi_libre_maven/raw/main/mobile-sdk-11.5.1" ``` - Build the project and perform the sanity tests again. diff --git a/tools/jitsi/build_jitsi_libs.sh b/tools/jitsi/build_jitsi_libs.sh index cf5634229a7..804163c5c43 100755 --- a/tools/jitsi/build_jitsi_libs.sh +++ b/tools/jitsi/build_jitsi_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 mobile-sdk-11.4.0 +git checkout mobile-sdk-11.5.1 echo echo "##################################################" @@ -52,11 +52,11 @@ npm install # #react-native bundle --platform android --dev false --entry-file index.android.js --bundle-output index.android.bundle --assets-dest android/app/src/main/res/ +mkdir -p /tmp/jitsi/org/webkit/ ./android/scripts/release-sdk.sh /tmp/jitsi/ # Also copy jsc -mkdir -p /tmp/jitsi/org/webkit/ cp -r ./node_modules/jsc-android/dist/org/webkit/android-jsc /tmp/jitsi/org/webkit/ echo diff --git a/vector/build.gradle b/vector/build.gradle index 561da835788..5f61566f44a 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:11.4.0') { + api('org.jitsi.react:jitsi-meet-sdk:11.5.1') { exclude group: 'com.google.firebase' exclude group: 'com.google.android.gms' exclude group: 'com.android.installreferrer' diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml index afad474d7e4..1fae87ee2ad 100644 --- a/vector/src/main/AndroidManifest.xml +++ b/vector/src/main/AndroidManifest.xml @@ -54,7 +54,7 @@ - +