From 6ac755b8ed5756116cfc794c04086bf02cb6673f Mon Sep 17 00:00:00 2001 From: Calin-Teodor Date: Thu, 27 Feb 2025 14:10:32 +0200 Subject: [PATCH] update sample apps with latest jitsi SDK --- android/java/JitsiSDKTest/app/build.gradle | 2 +- android/kotlin/JitsiSDKTest/app/build.gradle | 2 +- .../JitsiSDKTest/ConferenceViewController.m | 4 +- ios/objc/JitsiSDKTest/Podfile | 2 +- ios/objc/JitsiSDKTest/Podfile.lock | 8 ++-- .../JitsiSDKScreenSharingTest/Podfile | 2 +- .../JitsiSDKScreenSharingTest/Podfile.lock | 40 +++++++++---------- .../JitsiSDKTest.xcodeproj/project.pbxproj | 2 + ios/swift/JitsiSDKTest/Podfile | 2 +- ios/swift/JitsiSDKTest/Podfile.lock | 40 +++++++++---------- .../project.pbxproj | 4 +- react-native/ios/Podfile.lock | 4 +- react-native/package-lock.json | 8 ++-- react-native/package.json | 2 +- 14 files changed, 63 insertions(+), 59 deletions(-) diff --git a/android/java/JitsiSDKTest/app/build.gradle b/android/java/JitsiSDKTest/app/build.gradle index dd42d20..0aca65c 100644 --- a/android/java/JitsiSDKTest/app/build.gradle +++ b/android/java/JitsiSDKTest/app/build.gradle @@ -42,5 +42,5 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.1.3' // Jitsi Meet - implementation ('org.jitsi.react:jitsi-meet-sdk:11.0.0') { transitive = true } + implementation ('org.jitsi.react:jitsi-meet-sdk:11.0.4') { transitive = true } } diff --git a/android/kotlin/JitsiSDKTest/app/build.gradle b/android/kotlin/JitsiSDKTest/app/build.gradle index ad73ab0..9616aa1 100755 --- a/android/kotlin/JitsiSDKTest/app/build.gradle +++ b/android/kotlin/JitsiSDKTest/app/build.gradle @@ -43,5 +43,5 @@ dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.1.3' // Jitsi Meet - implementation ('org.jitsi.react:jitsi-meet-sdk:10.2.1') { transitive = true } + implementation ('org.jitsi.react:jitsi-meet-sdk:11.0.4') { transitive = true } } diff --git a/ios/objc/JitsiSDKTest/JitsiSDKTest/ConferenceViewController.m b/ios/objc/JitsiSDKTest/JitsiSDKTest/ConferenceViewController.m index 35660b0..3b59032 100644 --- a/ios/objc/JitsiSDKTest/JitsiSDKTest/ConferenceViewController.m +++ b/ios/objc/JitsiSDKTest/JitsiSDKTest/ConferenceViewController.m @@ -32,8 +32,8 @@ - (void)viewDidLoad { //builder.audioMuted = YES; // builder.videoMuted = YES; // Set different feature flags - // [builder setFeatureFlag:@"toolbox.enabled" withBoolean:NO]; - // [builder setFeatureFlag:@"filmstrip.enabled" withBoolean:NO]; + [builder setFeatureFlag:@"add-people.enabled" withBoolean:NO]; + [builder setFeatureFlag:@"filmstrip.enabled" withBoolean:YES]; // [builder setConfigOverride:@"customToolbarButtons" withArray:@[ // @{ // @"icon": @"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAFISURBVHgBxVWBcYMwDJQ7QbuBu4FHcDfoBvEGZQOSicgGdIPQCWADRnClQ76qYFE7Vy5/J3yRXpKlCAFwMEwJKcbo8CCxrJpQBmPMAPcCgz6jtChz1DGifBC3NrhnZ0KPElCsrIh1nUjkS4OfapwosbjM6S+yZ+Ktpmxu5419/R5pZKnraYk/Khu+gYU7ITpwTjojjCMeXzh675ozLKNKuCJvUng98dD+IpWOMwfFqY1btAo3sN3tK39sNurwO/xAv59Yb+mhvJnZljE2FxKtszLBYUgJJnooE7S3b65rhWjzJBOkIH7tgCV/4nGBLS7KJDkZU47pDMuGfMs4perS/zFw4hyvg2VMX9eGszYZpRAT1OSMx64KJh237AQ5vXRjLNhL8fe3I0AJVk4dJ3XCblnXi8t4qAGX3YhEOcw8HGo7H/fR/y98AzFrGjU3gjYAAAAAAElFTkSuQmCC", diff --git a/ios/objc/JitsiSDKTest/Podfile b/ios/objc/JitsiSDKTest/Podfile index 4febf2e..d0045ff 100644 --- a/ios/objc/JitsiSDKTest/Podfile +++ b/ios/objc/JitsiSDKTest/Podfile @@ -1,5 +1,5 @@ platform :ios, '15.1' target 'JitsiSDKTest' do - pod 'JitsiMeetSDK', '11.0.1' + pod 'JitsiMeetSDK', '11.0.4' end diff --git a/ios/objc/JitsiSDKTest/Podfile.lock b/ios/objc/JitsiSDKTest/Podfile.lock index d85ad03..f1ebd6d 100644 --- a/ios/objc/JitsiSDKTest/Podfile.lock +++ b/ios/objc/JitsiSDKTest/Podfile.lock @@ -1,7 +1,7 @@ PODS: - Giphy (2.2.12): - libwebp - - JitsiMeetSDK (11.0.1): + - JitsiMeetSDK (11.0.3): - Giphy (= 2.2.12) - JitsiWebRTC (~> 124.0) - JitsiWebRTC (124.0.2) @@ -19,7 +19,7 @@ PODS: - libwebp/sharpyuv DEPENDENCIES: - - JitsiMeetSDK (= 11.0.1) + - JitsiMeetSDK (= 11.0.3) SPEC REPOS: trunk: @@ -30,10 +30,10 @@ SPEC REPOS: SPEC CHECKSUMS: Giphy: 83628960ed04e1c3428ff1b4fb2b027f65e82f50 - JitsiMeetSDK: 67f7f5b7f6c1a9eed72dc304e05e0999b82626b2 + JitsiMeetSDK: 3337100e34c153ac9120e8464851164493daee6c JitsiWebRTC: b47805ab5668be38e7ee60e2258f49badfe8e1d0 libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8 -PODFILE CHECKSUM: b070837cf505589abed6433d1b03cb21bd3236de +PODFILE CHECKSUM: 0c8c696c83b420c10b0891776cf31f4db438f5d6 COCOAPODS: 1.16.2 diff --git a/ios/swift-screensharing/JitsiSDKScreenSharingTest/Podfile b/ios/swift-screensharing/JitsiSDKScreenSharingTest/Podfile index 1f5542f..d9e5821 100644 --- a/ios/swift-screensharing/JitsiSDKScreenSharingTest/Podfile +++ b/ios/swift-screensharing/JitsiSDKScreenSharingTest/Podfile @@ -13,6 +13,6 @@ target 'JitsiSDKScreenSharingTest' do use_frameworks! # Pods for JitsiSDKScreenSharingTest - pod 'JitsiMeetSDK', '10.2.1' + pod 'JitsiMeetSDK', '11.0.4' end diff --git a/ios/swift-screensharing/JitsiSDKScreenSharingTest/Podfile.lock b/ios/swift-screensharing/JitsiSDKScreenSharingTest/Podfile.lock index 3fb1541..733a07e 100644 --- a/ios/swift-screensharing/JitsiSDKScreenSharingTest/Podfile.lock +++ b/ios/swift-screensharing/JitsiSDKScreenSharingTest/Podfile.lock @@ -1,25 +1,25 @@ PODS: - - Giphy (2.2.4): + - Giphy (2.2.12): - libwebp - - JitsiMeetSDK (10.2.1): - - Giphy (= 2.2.4) + - JitsiMeetSDK (11.0.4): + - Giphy (= 2.2.12) - JitsiWebRTC (~> 124.0) - - JitsiWebRTC (124.0.1) - - libwebp (1.3.2): - - libwebp/demux (= 1.3.2) - - libwebp/mux (= 1.3.2) - - libwebp/sharpyuv (= 1.3.2) - - libwebp/webp (= 1.3.2) - - libwebp/demux (1.3.2): + - JitsiWebRTC (124.0.2) + - libwebp (1.5.0): + - libwebp/demux (= 1.5.0) + - libwebp/mux (= 1.5.0) + - libwebp/sharpyuv (= 1.5.0) + - libwebp/webp (= 1.5.0) + - libwebp/demux (1.5.0): - libwebp/webp - - libwebp/mux (1.3.2): + - libwebp/mux (1.5.0): - libwebp/demux - - libwebp/sharpyuv (1.3.2) - - libwebp/webp (1.3.2): + - libwebp/sharpyuv (1.5.0) + - libwebp/webp (1.5.0): - libwebp/sharpyuv DEPENDENCIES: - - JitsiMeetSDK (= 10.2.1) + - JitsiMeetSDK (= 11.0.4) SPEC REPOS: trunk: @@ -29,11 +29,11 @@ SPEC REPOS: - libwebp SPEC CHECKSUMS: - Giphy: 6b5f6986c8df4f71e01a8ef86595f426b3439fb5 - JitsiMeetSDK: cdba360baf6426a2f98cdc313c5b352d8cd3bbd7 - JitsiWebRTC: d0ae5fd6a81e771bfd82c2ee6c6bb542ebd65ee8 - libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009 + Giphy: 83628960ed04e1c3428ff1b4fb2b027f65e82f50 + JitsiMeetSDK: a9114d434bb31fbfae4589c100ce8674590afb22 + JitsiWebRTC: b47805ab5668be38e7ee60e2258f49badfe8e1d0 + libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8 -PODFILE CHECKSUM: 2a1846bdd185d450e8cce765b73cc4265b38522d +PODFILE CHECKSUM: 5436ac463bdea5699d7fb014cffba2833f6c2e56 -COCOAPODS: 1.15.2 +COCOAPODS: 1.16.2 diff --git a/ios/swift/JitsiSDKTest/JitsiSDKTest.xcodeproj/project.pbxproj b/ios/swift/JitsiSDKTest/JitsiSDKTest.xcodeproj/project.pbxproj index 392cb28..efe474b 100644 --- a/ios/swift/JitsiSDKTest/JitsiSDKTest.xcodeproj/project.pbxproj +++ b/ios/swift/JitsiSDKTest/JitsiSDKTest.xcodeproj/project.pbxproj @@ -204,12 +204,14 @@ "${PODS_ROOT}/Target Support Files/Pods-App/Pods-App-frameworks.sh", "${PODS_XCFRAMEWORKS_BUILD_DIR}/Giphy/GiphyUISDK.framework/GiphyUISDK", "${PODS_XCFRAMEWORKS_BUILD_DIR}/JitsiMeetSDK/JitsiMeetSDK.framework/JitsiMeetSDK", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/JitsiMeetSDK/hermes.framework/hermes", "${PODS_XCFRAMEWORKS_BUILD_DIR}/JitsiWebRTC/WebRTC.framework/WebRTC", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GiphyUISDK.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JitsiMeetSDK.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebRTC.framework", ); runOnlyForDeploymentPostprocessing = 0; diff --git a/ios/swift/JitsiSDKTest/Podfile b/ios/swift/JitsiSDKTest/Podfile index bdb14ae..d86ee58 100644 --- a/ios/swift/JitsiSDKTest/Podfile +++ b/ios/swift/JitsiSDKTest/Podfile @@ -1,5 +1,5 @@ platform :ios, '15.1' target 'App' do - pod 'JitsiMeetSDK', '10.2.1' + pod 'JitsiMeetSDK', '11.0.4' end diff --git a/ios/swift/JitsiSDKTest/Podfile.lock b/ios/swift/JitsiSDKTest/Podfile.lock index 604576e..0964178 100644 --- a/ios/swift/JitsiSDKTest/Podfile.lock +++ b/ios/swift/JitsiSDKTest/Podfile.lock @@ -1,25 +1,25 @@ PODS: - - Giphy (2.2.4): + - Giphy (2.2.12): - libwebp - - JitsiMeetSDK (10.2.1): - - Giphy (= 2.2.4) + - JitsiMeetSDK (11.0.4): + - Giphy (= 2.2.12) - JitsiWebRTC (~> 124.0) - - JitsiWebRTC (124.0.1) - - libwebp (1.3.2): - - libwebp/demux (= 1.3.2) - - libwebp/mux (= 1.3.2) - - libwebp/sharpyuv (= 1.3.2) - - libwebp/webp (= 1.3.2) - - libwebp/demux (1.3.2): + - JitsiWebRTC (124.0.2) + - libwebp (1.5.0): + - libwebp/demux (= 1.5.0) + - libwebp/mux (= 1.5.0) + - libwebp/sharpyuv (= 1.5.0) + - libwebp/webp (= 1.5.0) + - libwebp/demux (1.5.0): - libwebp/webp - - libwebp/mux (1.3.2): + - libwebp/mux (1.5.0): - libwebp/demux - - libwebp/sharpyuv (1.3.2) - - libwebp/webp (1.3.2): + - libwebp/sharpyuv (1.5.0) + - libwebp/webp (1.5.0): - libwebp/sharpyuv DEPENDENCIES: - - JitsiMeetSDK (= 10.2.1) + - JitsiMeetSDK (= 11.0.4) SPEC REPOS: trunk: @@ -29,11 +29,11 @@ SPEC REPOS: - libwebp SPEC CHECKSUMS: - Giphy: 6b5f6986c8df4f71e01a8ef86595f426b3439fb5 - JitsiMeetSDK: cdba360baf6426a2f98cdc313c5b352d8cd3bbd7 - JitsiWebRTC: d0ae5fd6a81e771bfd82c2ee6c6bb542ebd65ee8 - libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009 + Giphy: 83628960ed04e1c3428ff1b4fb2b027f65e82f50 + JitsiMeetSDK: a9114d434bb31fbfae4589c100ce8674590afb22 + JitsiWebRTC: b47805ab5668be38e7ee60e2258f49badfe8e1d0 + libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8 -PODFILE CHECKSUM: 12282701f8a8a127e22e4ced1443cd9b44fcb7c2 +PODFILE CHECKSUM: cf567a0b2195ffdacdc97e6dc26698ca2bece4c3 -COCOAPODS: 1.15.2 +COCOAPODS: 1.16.2 diff --git a/ios/swiftui/JitsiSwiftUIDemo.xcodeproj/project.pbxproj b/ios/swiftui/JitsiSwiftUIDemo.xcodeproj/project.pbxproj index 9ba2815..53f75f5 100644 --- a/ios/swiftui/JitsiSwiftUIDemo.xcodeproj/project.pbxproj +++ b/ios/swiftui/JitsiSwiftUIDemo.xcodeproj/project.pbxproj @@ -274,6 +274,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = "\"$(SRCROOT)/JitsiSwiftUIDemo/Preview Content\""; + DEVELOPMENT_TEAM = AJT772J42H; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "$(SRCROOT)/JitsiSwiftUIDemo//Info.plist"; @@ -303,6 +304,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = "\"$(SRCROOT)/JitsiSwiftUIDemo/Preview Content\""; + DEVELOPMENT_TEAM = AJT772J42H; ENABLE_PREVIEWS = YES; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "$(SRCROOT)/JitsiSwiftUIDemo//Info.plist"; @@ -353,7 +355,7 @@ repositoryURL = "https://github.com/jitsi/jitsi-meet-ios-sdk-releases.git"; requirement = { kind = exactVersion; - version = 11.0.2; + version = 11.0.4; }; }; /* End XCRemoteSwiftPackageReference section */ diff --git a/react-native/ios/Podfile.lock b/react-native/ios/Podfile.lock index 2d0c01f..e3799e1 100644 --- a/react-native/ios/Podfile.lock +++ b/react-native/ios/Podfile.lock @@ -32,7 +32,7 @@ PODS: - hermes-engine (0.75.5): - hermes-engine/Pre-built (= 0.75.5) - hermes-engine/Pre-built (0.75.5) - - jitsi-meet-rnsdk (11.0.0): + - jitsi-meet-rnsdk (11.0.4): - ObjectiveDropboxOfficial (= 6.2.3) - React-Core - react-native-webrtc @@ -1986,7 +1986,7 @@ SPEC CHECKSUMS: GTMAppAuth: f69bd07d68cd3b766125f7e072c45d7340dea0de GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6 hermes-engine: c9fe5870af65876125fdbbf833071b6f329db30d - jitsi-meet-rnsdk: 2e501f3bf37797d4eae00664cff723bac8737dbb + jitsi-meet-rnsdk: 791ca2c8fd8753d4c91316da1537bb62e643603e JitsiWebRTC: d0ae5fd6a81e771bfd82c2ee6c6bb542ebd65ee8 libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009 ObjectiveDropboxOfficial: fe206ce8c0bc49976c249d472db7fdbc53ebbd53 diff --git a/react-native/package-lock.json b/react-native/package-lock.json index 8c21ad5..d63ca2b 100644 --- a/react-native/package-lock.json +++ b/react-native/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@amplitude/react-native": "2.17.3", "@giphy/react-native-sdk": "2.3.0", - "@jitsi/react-native-sdk": "11.0.0", + "@jitsi/react-native-sdk": "11.0.4", "@react-native-async-storage/async-storage": "1.23.1", "@react-native-clipboard/clipboard": "1.14.3", "@react-native-community/netinfo": "11.1.0", @@ -2292,9 +2292,9 @@ "license": "Apache-2.0" }, "node_modules/@jitsi/react-native-sdk": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/@jitsi/react-native-sdk/-/react-native-sdk-11.0.0.tgz", - "integrity": "sha512-b55X5DOQ24Ij2+BS/8EMxGYx3KplVcbbNNzCp2+daz9DugXAXT4/ye9MG8IEefjSs8zYu9eqMJsmn65zzDID1g==", + "version": "11.0.4", + "resolved": "https://registry.npmjs.org/@jitsi/react-native-sdk/-/react-native-sdk-11.0.4.tgz", + "integrity": "sha512-dLbbVwg5NloBNeiPhGn6eEb3TPFxm21rqz3PKLDxbe8jyqZuqTHxTA7DLxC5iyyH2JCJeot0rdfLSKG1EVGQOQ==", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { diff --git a/react-native/package.json b/react-native/package.json index 7e719db..79a1a07 100644 --- a/react-native/package.json +++ b/react-native/package.json @@ -12,7 +12,7 @@ "dependencies": { "@amplitude/react-native": "2.17.3", "@giphy/react-native-sdk": "2.3.0", - "@jitsi/react-native-sdk": "11.0.0", + "@jitsi/react-native-sdk": "11.0.4", "@react-native-async-storage/async-storage": "1.23.1", "@react-native-clipboard/clipboard": "1.14.3", "@react-native-community/netinfo": "11.1.0",