diff --git a/ios/Podfile b/ios/Podfile index be8dad187a..eb9dcf86a8 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -42,6 +42,7 @@ target 'JitsiMeetSDK' do pod 'CocoaLumberjack', '3.7.2' pod 'ObjectiveDropboxOfficial', '6.2.3' + pod 'JitsiWebRTC', '~> 106.0.0' end target 'JitsiMeetSDKLite' do diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 85902ab72c..a5f34b39ff 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -133,6 +133,7 @@ PODS: - AppAuth/Core (~> 1.4) - GTMSessionFetcher/Core (~> 1.5) - GTMSessionFetcher/Core (1.7.0) + - JitsiWebRTC (106.0.0) - libwebp (1.2.1): - libwebp/demux (= 1.2.1) - libwebp/mux (= 1.2.1) @@ -384,7 +385,8 @@ PODS: - react-native-video/Video (6.0.0-alpha.1): - PromisesSwift - React-Core - - react-native-webrtc (1.106.0): + - react-native-webrtc (1.106.1): + - JitsiWebRTC (~> 106.0.0) - React-Core - react-native-webview (11.15.1): - React-Core @@ -496,6 +498,7 @@ DEPENDENCIES: - Firebase/DynamicLinks (~> 8.0) - "giphy-react-native-sdk (from `../node_modules/@giphy/react-native-sdk`)" - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) + - JitsiWebRTC (~> 106.0.0) - ObjectiveDropboxOfficial (= 6.2.3) - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) @@ -571,6 +574,7 @@ SPEC REPOS: - GoogleUtilities - GTMAppAuth - GTMSessionFetcher + - JitsiWebRTC - libwebp - nanopb - ObjectiveDropboxOfficial @@ -721,6 +725,7 @@ SPEC CHECKSUMS: GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1 GTMAppAuth: ad5c2b70b9a8689e1a04033c9369c4915bfcbe89 GTMSessionFetcher: 43748f93435c2aa068b1cbe39655aaf600652e91 + JitsiWebRTC: f441eb0e2d67f0588bf24e21c5162e97342714fb libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96 ObjectiveDropboxOfficial: fe206ce8c0bc49976c249d472db7fdbc53ebbd53 @@ -750,7 +755,7 @@ SPEC CHECKSUMS: react-native-slider: 6e9b86e76cce4b9e35b3403193a6432ed07e0c81 react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457 react-native-video: bb6f12a7198db53b261fefb5d609dc77417acc8b - react-native-webrtc: ae0a19dd7de9889f7596989f33db67c58632323c + react-native-webrtc: 4a4c31be61f88d1d3356526eebce72f462a6760e react-native-webview: ea4899a1056c782afa96dd082179a66cbebf5504 React-perflogger: fa15d1d29ff7557ee25ea48f7f59e65896fb3215 React-RCTActionSheet: e83515333352a3cc19c146e3c7a63a8a9269da8f @@ -778,6 +783,6 @@ SPEC CHECKSUMS: RNWatch: dae6c858a2051dbdcfb00b9a86cf4d90400263b4 Yoga: 2f6a78c58dcc2963bd8e34d96a4246d9dff2e3a7 -PODFILE CHECKSUM: 55f1a79792dd5f74b7510fc84068abcb79ddd518 +PODFILE CHECKSUM: e671cdcdb80fab67e305861c36bfae8ed5a5b0ef COCOAPODS: 1.11.3 diff --git a/ios/app/app.xcodeproj/project.pbxproj b/ios/app/app.xcodeproj/project.pbxproj index 5f360423c2..546a59b691 100644 --- a/ios/app/app.xcodeproj/project.pbxproj +++ b/ios/app/app.xcodeproj/project.pbxproj @@ -31,11 +31,11 @@ 4EB0603C260E09D000F524C5 /* SocketConnection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB06039260E09D000F524C5 /* SocketConnection.swift */; }; 4EB0603D260E09D000F524C5 /* DarwinNotificationCenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB0603A260E09D000F524C5 /* DarwinNotificationCenter.swift */; }; 4EB0603E260E09D000F524C5 /* SampleUploader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EB0603B260E09D000F524C5 /* SampleUploader.swift */; }; - DE050389256E904600DEE3A5 /* WebRTC.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE050388256E904600DEE3A5 /* WebRTC.xcframework */; }; - DE05038A256E904600DEE3A5 /* WebRTC.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DE050388256E904600DEE3A5 /* WebRTC.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; DE4C456121DE1E4E00EA0709 /* FIRUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = DE4C455F21DE1E4E00EA0709 /* FIRUtilities.m */; }; DEA9F289258A6EA800D4CD74 /* JitsiMeetSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */; }; DEA9F28A258A6EA800D4CD74 /* JitsiMeetSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + DED016F128ECBC9D009D5E8D /* WebRTC.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = DED016F028ECBC9D009D5E8D /* WebRTC.xcframework */; }; + DED016F228ECBC9D009D5E8D /* WebRTC.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DED016F028ECBC9D009D5E8D /* WebRTC.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; E588011722789D43008B0561 /* JitsiMeetContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = E58801132278944E008B0561 /* JitsiMeetContext.swift */; }; E5C97B63227A1EB400199214 /* JitsiMeetCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5C97B62227A1EB400199214 /* JitsiMeetCommands.swift */; }; FD572B9827EDF32300A800FB /* GiphyUISDK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = FD572B9727EDF32300A800FB /* GiphyUISDK.xcframework */; }; @@ -75,7 +75,7 @@ files = ( DEA9F28A258A6EA800D4CD74 /* JitsiMeetSDK.framework in Embed Frameworks */, FD572B9927EDF32300A800FB /* GiphyUISDK.xcframework in Embed Frameworks */, - DE05038A256E904600DEE3A5 /* WebRTC.xcframework in Embed Frameworks */, + DED016F228ECBC9D009D5E8D /* WebRTC.xcframework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -158,6 +158,7 @@ DE4C455F21DE1E4E00EA0709 /* FIRUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRUtilities.m; sourceTree = ""; }; DE4C456021DE1E4E00EA0709 /* FIRUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRUtilities.h; sourceTree = ""; }; DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = JitsiMeetSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + DED016F028ECBC9D009D5E8D /* WebRTC.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = WebRTC.xcframework; path = ../Pods/JitsiWebRTC/WebRTC.xcframework; sourceTree = ""; }; DEFDBBDB25656E3B00344B23 /* WebRTC.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = WebRTC.xcframework; path = "../../node_modules/react-native-webrtc/ios/WebRTC.xcframework"; sourceTree = ""; }; E58801132278944E008B0561 /* JitsiMeetContext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JitsiMeetContext.swift; sourceTree = ""; }; E5C97B62227A1EB400199214 /* JitsiMeetCommands.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JitsiMeetCommands.swift; sourceTree = ""; }; @@ -176,7 +177,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DE050389256E904600DEE3A5 /* WebRTC.xcframework in Frameworks */, + DED016F128ECBC9D009D5E8D /* WebRTC.xcframework in Frameworks */, DEA9F289258A6EA800D4CD74 /* JitsiMeetSDK.framework in Frameworks */, FD572B9827EDF32300A800FB /* GiphyUISDK.xcframework in Frameworks */, 2681BB562C7A0B42CFBA6719 /* libPods-JitsiMeet.a in Frameworks */, @@ -204,6 +205,7 @@ 0B26BE711EC5BC4D00EEFB41 /* Frameworks */ = { isa = PBXGroup; children = ( + DED016F028ECBC9D009D5E8D /* WebRTC.xcframework */, FD572B9727EDF32300A800FB /* GiphyUISDK.xcframework */, DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */, DE050388256E904600DEE3A5 /* WebRTC.xcframework */, diff --git a/package-lock.json b/package-lock.json index 61ad12ae83..c77f1f1ecb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -114,7 +114,7 @@ "react-native-url-polyfill": "1.3.0", "react-native-video": "https://git@github.com/react-native-video/react-native-video#7c48ae7c8544b2b537fb60194e9620b9fcceae52", "react-native-watch-connectivity": "1.0.11", - "react-native-webrtc": "https://git@github.com/react-native-webrtc/react-native-webrtc#ed07969a85c159953d3004cfd04d44792b95e8db", + "react-native-webrtc": "1.106.1", "react-native-webview": "11.15.1", "react-native-youtube-iframe": "2.2.1", "react-redux": "7.1.0", @@ -16469,11 +16469,10 @@ } }, "node_modules/react-native-webrtc": { - "version": "1.106.0", - "resolved": "git+https://git@github.com/react-native-webrtc/react-native-webrtc.git#ed07969a85c159953d3004cfd04d44792b95e8db", - "integrity": "sha512-hpYt1DuN0QCBuZOXoqR51AxIU2n0lKcGS2YGsww1wYXBCwVzKi6mhVyDVPNH7bU93UBXXnMCzLI4VJzv70GoYg==", + "version": "1.106.1", + "resolved": "https://registry.npmjs.org/react-native-webrtc/-/react-native-webrtc-1.106.1.tgz", + "integrity": "sha512-955gqWFdISARz9D4hmnPzKQwpaU+AGqUbU+vBjzLCozUseSJ69tTQg2cShyPCBH6A1rwJQE+mrdjcpkeGbx3pQ==", "hasInstallScript": true, - "license": "MIT", "dependencies": { "adm-zip": "0.5.9", "base64-js": "1.5.1", @@ -32748,9 +32747,9 @@ } }, "react-native-webrtc": { - "version": "git+https://git@github.com/react-native-webrtc/react-native-webrtc.git#ed07969a85c159953d3004cfd04d44792b95e8db", - "integrity": "sha512-hpYt1DuN0QCBuZOXoqR51AxIU2n0lKcGS2YGsww1wYXBCwVzKi6mhVyDVPNH7bU93UBXXnMCzLI4VJzv70GoYg==", - "from": "react-native-webrtc@https://git@github.com/react-native-webrtc/react-native-webrtc#ed07969a85c159953d3004cfd04d44792b95e8db", + "version": "1.106.1", + "resolved": "https://registry.npmjs.org/react-native-webrtc/-/react-native-webrtc-1.106.1.tgz", + "integrity": "sha512-955gqWFdISARz9D4hmnPzKQwpaU+AGqUbU+vBjzLCozUseSJ69tTQg2cShyPCBH6A1rwJQE+mrdjcpkeGbx3pQ==", "requires": { "adm-zip": "0.5.9", "base64-js": "1.5.1", diff --git a/package.json b/package.json index c5d86afc8d..4d10ef81d0 100644 --- a/package.json +++ b/package.json @@ -119,7 +119,7 @@ "react-native-url-polyfill": "1.3.0", "react-native-video": "https://git@github.com/react-native-video/react-native-video#7c48ae7c8544b2b537fb60194e9620b9fcceae52", "react-native-watch-connectivity": "1.0.11", - "react-native-webrtc": "https://git@github.com/react-native-webrtc/react-native-webrtc#ed07969a85c159953d3004cfd04d44792b95e8db", + "react-native-webrtc": "1.106.1", "react-native-webview": "11.15.1", "react-native-youtube-iframe": "2.2.1", "react-redux": "7.1.0",