diff --git a/ios/Podfile b/ios/Podfile index 79933610a..9b69a1513 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -3,7 +3,7 @@ workspace 'jitsi-meet' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' install! 'cocoapods', :deterministic_uuids => false -target 'jitsi-meet' do +target 'JitsiMeet' do project 'app/app.xcodeproj' pod 'Firebase/Analytics', '~> 6.33.0' @@ -11,7 +11,7 @@ target 'jitsi-meet' do pod 'Firebase/DynamicLinks', '~> 6.33.0' end -target 'JitsiMeet' do +target 'JitsiMeetSDK' do project 'sdk/sdk.xcodeproj' # React Native and its dependencies diff --git a/ios/Podfile.lock b/ios/Podfile.lock index b19b42e94..3f1202b75 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -582,6 +582,6 @@ SPEC CHECKSUMS: RNWatch: a5320c959c75e72845c07985f3e935e58998f1d3 Yoga: 96b469c5e81ff51b917b92e8c3390642d4ded30c -PODFILE CHECKSUM: f6626cd705333112182cedbe175ae2f9006e8874 +PODFILE CHECKSUM: e77f7134cda53f089046f29cb1f32b08c00c8a2e COCOAPODS: 1.10.0 diff --git a/ios/app/app.xcodeproj/project.pbxproj b/ios/app/app.xcodeproj/project.pbxproj index ec5541fcd..815ee1c69 100644 --- a/ios/app/app.xcodeproj/project.pbxproj +++ b/ios/app/app.xcodeproj/project.pbxproj @@ -7,8 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 0B26BE6E1EC5BC3C00EEFB41 /* JitsiMeet.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0B26BE6D1EC5BC3C00EEFB41 /* JitsiMeet.framework */; }; - 0B26BE6F1EC5BC3C00EEFB41 /* JitsiMeet.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0B26BE6D1EC5BC3C00EEFB41 /* JitsiMeet.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 0B412F1F1EDEE6E800B1A0A6 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0B412F1E1EDEE6E800B1A0A6 /* ViewController.m */; }; 0B412F211EDEE95300B1A0A6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 0B412F201EDEE95300B1A0A6 /* Main.storyboard */; }; 0B5418471F7C5D8C00A2DD86 /* MeetingRowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B5418461F7C5D8C00A2DD86 /* MeetingRowController.swift */; }; @@ -25,10 +23,12 @@ 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; - 695AF3ED6F686F9C5EE40F9A /* libPods-jitsi-meet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 489E8EFE2C720D10F5961AEF /* libPods-jitsi-meet.a */; }; + 55BEDABDA92D47D399A70A5E /* libPods-JitsiMeet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D878B07B3FBD6E305EAA6B27 /* libPods-JitsiMeet.a */; }; 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, ); }; }; E588011722789D43008B0561 /* JitsiMeetContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = E58801132278944E008B0561 /* JitsiMeetContext.swift */; }; E5C97B63227A1EB400199214 /* JitsiMeetCommands.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5C97B62227A1EB400199214 /* JitsiMeetCommands.swift */; }; /* End PBXBuildFile section */ @@ -57,8 +57,8 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( + DEA9F28A258A6EA800D4CD74 /* JitsiMeetSDK.framework in Embed Frameworks */, DE05038A256E904600DEE3A5 /* WebRTC.xcframework in Embed Frameworks */, - 0B26BE6F1EC5BC3C00EEFB41 /* JitsiMeet.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -115,14 +115,17 @@ 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 4670A512A688E2DC34528282 /* Pods-jitsi-meet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-jitsi-meet.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-jitsi-meet/Pods-jitsi-meet.debug.xcconfig"; sourceTree = ""; }; - 489E8EFE2C720D10F5961AEF /* libPods-jitsi-meet.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-jitsi-meet.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 609CB2080B75F75A89923F3D /* Pods-JitsiMeet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.debug.xcconfig"; sourceTree = ""; }; B3B083EB1D4955FF0069CEE7 /* app.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = app.entitlements; sourceTree = ""; }; + D878B07B3FBD6E305EAA6B27 /* libPods-JitsiMeet.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JitsiMeet.a"; sourceTree = BUILT_PRODUCTS_DIR; }; DE050388256E904600DEE3A5 /* WebRTC.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = WebRTC.xcframework; path = "../../node_modules/react-native-webrtc/apple/WebRTC.xcframework"; sourceTree = ""; }; 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; }; 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 = ""; }; + FC040BBED70876444D89E91C /* Pods-JitsiMeet.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.release.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -137,9 +140,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 0B26BE6E1EC5BC3C00EEFB41 /* JitsiMeet.framework in Frameworks */, - 695AF3ED6F686F9C5EE40F9A /* libPods-jitsi-meet.a in Frameworks */, DE050389256E904600DEE3A5 /* WebRTC.xcframework in Frameworks */, + DEA9F289258A6EA800D4CD74 /* JitsiMeetSDK.framework in Frameworks */, + 55BEDABDA92D47D399A70A5E /* libPods-JitsiMeet.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -156,11 +159,12 @@ 0B26BE711EC5BC4D00EEFB41 /* Frameworks */ = { isa = PBXGroup; children = ( + DEA9F288258A6EA800D4CD74 /* JitsiMeetSDK.framework */, DE050388256E904600DEE3A5 /* WebRTC.xcframework */, 0B26BE6D1EC5BC3C00EEFB41 /* JitsiMeet.framework */, DEFDBBDB25656E3B00344B23 /* WebRTC.xcframework */, 0BD6B4361EF82A6B00D1F4CD /* WebRTC.framework */, - 489E8EFE2C720D10F5961AEF /* libPods-jitsi-meet.a */, + D878B07B3FBD6E305EAA6B27 /* libPods-JitsiMeet.a */, ); name = Frameworks; sourceTree = ""; @@ -217,6 +221,8 @@ children = ( 4670A512A688E2DC34528282 /* Pods-jitsi-meet.debug.xcconfig */, 09AA3B93E4CC62D84B424690 /* Pods-jitsi-meet.release.xcconfig */, + 609CB2080B75F75A89923F3D /* Pods-JitsiMeet.debug.xcconfig */, + FC040BBED70876444D89E91C /* Pods-JitsiMeet.release.xcconfig */, ); name = Pods; sourceTree = ""; @@ -284,9 +290,9 @@ productReference = 0BEA5C311F7B8F73000D0AB4 /* JitsiMeetCompanion Extension.appex */; productType = "com.apple.product-type.watchkit2-extension"; }; - 13B07F861A680F5B00A75B9A /* jitsi-meet */ = { + 13B07F861A680F5B00A75B9A /* JitsiMeet */ = { isa = PBXNativeTarget; - buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "jitsi-meet" */; + buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "JitsiMeet" */; buildPhases = ( B6607F42A5CF0C76E98929E2 /* [CP] Check Pods Manifest.lock */, 0BBA83C41EC9F7600075A103 /* Run React packager */, @@ -305,7 +311,7 @@ dependencies = ( 0BEA5C401F7B8F73000D0AB4 /* PBXTargetDependency */, ); - name = "jitsi-meet"; + name = JitsiMeet; productName = "Jitsi Meet"; productReference = 13B07F961A680F5B00A75B9A /* jitsi-meet.app */; productType = "com.apple.product-type.application"; @@ -356,7 +362,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 13B07F861A680F5B00A75B9A /* jitsi-meet */, + 13B07F861A680F5B00A75B9A /* JitsiMeet */, 0BEA5C241F7B8F73000D0AB4 /* JitsiMeetCompanion */, 0BEA5C301F7B8F73000D0AB4 /* JitsiMeetCompanion Extension */, ); @@ -437,7 +443,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-jitsi-meet-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-JitsiMeet-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -707,7 +713,7 @@ }; 13B07F941A680F5B00A75B9A /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4670A512A688E2DC34528282 /* Pods-jitsi-meet.debug.xcconfig */; + baseConfigurationReference = 609CB2080B75F75A89923F3D /* Pods-JitsiMeet.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDebug; CODE_SIGN_ENTITLEMENTS = app.entitlements; @@ -736,7 +742,7 @@ }; 13B07F951A680F5B00A75B9A /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 09AA3B93E4CC62D84B424690 /* Pods-jitsi-meet.release.xcconfig */; + baseConfigurationReference = FC040BBED70876444D89E91C /* Pods-JitsiMeet.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIconRelease; CODE_SIGN_ENTITLEMENTS = app.entitlements; @@ -897,7 +903,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "jitsi-meet" */ = { + 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "JitsiMeet" */ = { isa = XCConfigurationList; buildConfigurations = ( 13B07F941A680F5B00A75B9A /* Debug */, diff --git a/ios/app/app.xcodeproj/xcshareddata/xcschemes/jitsi-meet.xcscheme b/ios/app/app.xcodeproj/xcshareddata/xcschemes/JitsiMeet.xcscheme similarity index 94% rename from ios/app/app.xcodeproj/xcshareddata/xcschemes/jitsi-meet.xcscheme rename to ios/app/app.xcodeproj/xcshareddata/xcschemes/JitsiMeet.xcscheme index 4555b9db4..811a144ab 100644 --- a/ios/app/app.xcodeproj/xcshareddata/xcschemes/jitsi-meet.xcscheme +++ b/ios/app/app.xcodeproj/xcshareddata/xcschemes/JitsiMeet.xcscheme @@ -15,8 +15,8 @@ @@ -30,7 +30,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "13B07F861A680F5B00A75B9A" BuildableName = "jitsi-meet.app" - BlueprintName = "jitsi-meet" + BlueprintName = "JitsiMeet" ReferencedContainer = "container:app.xcodeproj"> @@ -46,7 +46,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "13B07F861A680F5B00A75B9A" BuildableName = "jitsi-meet.app" - BlueprintName = "jitsi-meet" + BlueprintName = "JitsiMeet" ReferencedContainer = "container:app.xcodeproj"> @@ -69,7 +69,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "13B07F861A680F5B00A75B9A" BuildableName = "jitsi-meet.app" - BlueprintName = "jitsi-meet" + BlueprintName = "JitsiMeet" ReferencedContainer = "container:app.xcodeproj"> @@ -86,7 +86,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "13B07F861A680F5B00A75B9A" BuildableName = "jitsi-meet.app" - BlueprintName = "jitsi-meet" + BlueprintName = "JitsiMeet" ReferencedContainer = "container:app.xcodeproj"> diff --git a/ios/app/src/AppDelegate.m b/ios/app/src/AppDelegate.m index c9b084bae..154398159 100644 --- a/ios/app/src/AppDelegate.m +++ b/ios/app/src/AppDelegate.m @@ -21,7 +21,7 @@ #import "ViewController.h" @import Firebase; -@import JitsiMeet; +@import JitsiMeetSDK; @implementation AppDelegate diff --git a/ios/app/src/FIRUtilities.m b/ios/app/src/FIRUtilities.m index 535dddd7d..69c47f7db 100644 --- a/ios/app/src/FIRUtilities.m +++ b/ios/app/src/FIRUtilities.m @@ -16,7 +16,7 @@ #import "FIRUtilities.h" -@import JitsiMeet; +@import JitsiMeetSDK; @implementation FIRUtilities diff --git a/ios/app/src/ViewController.h b/ios/app/src/ViewController.h index ec3797757..1b1d967fd 100644 --- a/ios/app/src/ViewController.h +++ b/ios/app/src/ViewController.h @@ -14,9 +14,8 @@ * limitations under the License. */ -#import - -#import +@import UIKit; +@import JitsiMeetSDK; @interface ViewController : UIViewController diff --git a/ios/app/src/ViewController.m b/ios/app/src/ViewController.m index 4172c0e79..6f137a04f 100644 --- a/ios/app/src/ViewController.m +++ b/ios/app/src/ViewController.m @@ -21,7 +21,7 @@ @import MobileCoreServices; @import Intents; // Needed for NSUserActivity suggestedInvocationPhrase -@import JitsiMeet; +@import JitsiMeetSDK; #import "Types.h" #import "ViewController.h" diff --git a/ios/scripts/release-sdk.sh b/ios/scripts/release-sdk.sh index 0803cca5b..1bc8181fc 100755 --- a/ios/scripts/release-sdk.sh +++ b/ios/scripts/release-sdk.sh @@ -27,10 +27,10 @@ pushd ${PROJECT_REPO} rm -rf ios/sdk/out xcodebuild clean \ -workspace ios/jitsi-meet.xcworkspace \ - -scheme JitsiMeet + -scheme JitsiMeetSDK xcodebuild archive \ -workspace ios/jitsi-meet.xcworkspace \ - -scheme JitsiMeet \ + -scheme JitsiMeetSDK \ -configuration Release \ -sdk iphonesimulator \ -destination='generic/platform=iOS Simulator' \ @@ -41,7 +41,7 @@ xcodebuild archive \ BUILD_LIBRARY_FOR_DISTRIBUTION=YES xcodebuild archive \ -workspace ios/jitsi-meet.xcworkspace \ - -scheme JitsiMeet \ + -scheme JitsiMeetSDK \ -configuration Release \ -sdk iphoneos \ -destination='generic/platform=iOS' \ @@ -51,9 +51,9 @@ xcodebuild archive \ SKIP_INSTALL=NO \ BUILD_LIBRARY_FOR_DISTRIBUTION=YES xcodebuild -create-xcframework \ - -framework ios/sdk/out/ios-device.xcarchive/Products/Library/Frameworks/JitsiMeet.framework \ - -framework ios/sdk/out/ios-simulator.xcarchive/Products/Library/Frameworks/JitsiMeet.framework \ - -output ios/sdk/out/JitsiMeet.xcframework + -framework ios/sdk/out/ios-device.xcarchive/Products/Library/Frameworks/JitsiMeetSDK.framework \ + -framework ios/sdk/out/ios-simulator.xcarchive/Products/Library/Frameworks/JitsiMeetSDK.framework \ + -output ios/sdk/out/JitsiMeetSDK.xcframework if [[ $DO_GIT_TAG == 1 ]]; then git tag ios-sdk-${SDK_VERSION} fi @@ -62,7 +62,7 @@ popd pushd ${RELEASE_REPO} # Put the new files in the repo -cp -a ${PROJECT_REPO}/ios/sdk/out/JitsiMeet.xcframework Frameworks/ +cp -a ${PROJECT_REPO}/ios/sdk/out/JitsiMeetSDK.xcframework Frameworks/ cp -a ${PROJECT_REPO}/node_modules/react-native-webrtc/apple/WebRTC.xcframework Frameworks/ # Add all files to git diff --git a/ios/sdk/sdk.xcodeproj/project.pbxproj b/ios/sdk/sdk.xcodeproj/project.pbxproj index d4bf605b2..0bd4d2735 100644 --- a/ios/sdk/sdk.xcodeproj/project.pbxproj +++ b/ios/sdk/sdk.xcodeproj/project.pbxproj @@ -24,9 +24,9 @@ 0BCA49601EC4B6C600B793EE /* POSIX.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BCA495D1EC4B6C600B793EE /* POSIX.m */; }; 0BCA49611EC4B6C600B793EE /* Proximity.m in Sources */ = {isa = PBXBuildFile; fileRef = 0BCA495E1EC4B6C600B793EE /* Proximity.m */; }; 0BD906EA1EC0C00300C8C18E /* JitsiMeet.h in Headers */ = {isa = PBXBuildFile; fileRef = 0BD906E81EC0C00300C8C18E /* JitsiMeet.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 0F65EECE1D95DA94561BB47E /* libPods-JitsiMeet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 03F2ADC957FF109849B7FCA1 /* libPods-JitsiMeet.a */; }; 6C31EDC820C06D490089C899 /* recordingOn.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 6C31EDC720C06D490089C899 /* recordingOn.mp3 */; }; 6C31EDCA20C06D530089C899 /* recordingOff.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 6C31EDC920C06D530089C899 /* recordingOff.mp3 */; }; + 6F08DF7D4458EE3CF3F36F6D /* libPods-JitsiMeetSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4376CA6886DE68FD7A4294B /* libPods-JitsiMeetSDK.a */; }; 75635B0A20751D6D00F29C9F /* joined.wav in Resources */ = {isa = PBXBuildFile; fileRef = 75635B0820751D6D00F29C9F /* joined.wav */; }; 75635B0B20751D6D00F29C9F /* left.wav in Resources */ = {isa = PBXBuildFile; fileRef = 75635B0920751D6D00F29C9F /* left.wav */; }; 87FE6F3321E52437004A5DC7 /* incomingMessage.wav in Resources */ = {isa = PBXBuildFile; fileRef = 87FE6F3221E52437004A5DC7 /* incomingMessage.wav */; }; @@ -54,6 +54,7 @@ DE81A2D92316AC7600AE1940 /* LogBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = DE81A2D72316AC7600AE1940 /* LogBridge.m */; }; DE81A2DE2317ED5400AE1940 /* JitsiMeetBaseLogHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = DE81A2DC2317ED5400AE1940 /* JitsiMeetBaseLogHandler.h */; settings = {ATTRIBUTES = (Public, ); }; }; DE81A2DF2317ED5400AE1940 /* JitsiMeetBaseLogHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = DE81A2DD2317ED5400AE1940 /* JitsiMeetBaseLogHandler.m */; }; + DEA9F284258A5D9900D4CD74 /* JitsiMeetSDK.h in Headers */ = {isa = PBXBuildFile; fileRef = DEA9F283258A5D9900D4CD74 /* JitsiMeetSDK.h */; settings = {ATTRIBUTES = (Public, ); }; }; DEAD3226220C497000E93636 /* JitsiMeetConferenceOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = DEAD3224220C497000E93636 /* JitsiMeetConferenceOptions.h */; settings = {ATTRIBUTES = (Public, ); }; }; DEAD3227220C497000E93636 /* JitsiMeetConferenceOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = DEAD3225220C497000E93636 /* JitsiMeetConferenceOptions.m */; }; DEAFA779229EAD520033A7FA /* RNRootView.m in Sources */ = {isa = PBXBuildFile; fileRef = DEAFA778229EAD520033A7FA /* RNRootView.m */; }; @@ -63,7 +64,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 03F2ADC957FF109849B7FCA1 /* libPods-JitsiMeet.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JitsiMeet.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 09A78016288AF50ACD28A10D /* Pods-JitsiMeetSDK.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeetSDK.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeetSDK/Pods-JitsiMeetSDK.debug.xcconfig"; sourceTree = ""; }; 0B412F161EDEC65D00B1A0A6 /* JitsiMeetView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JitsiMeetView.h; sourceTree = ""; }; 0B412F171EDEC65D00B1A0A6 /* JitsiMeetView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JitsiMeetView.m; sourceTree = ""; }; 0B412F1B1EDEC80100B1A0A6 /* JitsiMeetViewDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeetViewDelegate.h; sourceTree = ""; }; @@ -81,7 +82,7 @@ 0BCA495C1EC4B6C600B793EE /* AudioMode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AudioMode.m; sourceTree = ""; }; 0BCA495D1EC4B6C600B793EE /* POSIX.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = POSIX.m; sourceTree = ""; }; 0BCA495E1EC4B6C600B793EE /* Proximity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Proximity.m; sourceTree = ""; }; - 0BD906E51EC0C00300C8C18E /* JitsiMeet.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JitsiMeet.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 0BD906E51EC0C00300C8C18E /* JitsiMeetSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = JitsiMeetSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 0BD906E81EC0C00300C8C18E /* JitsiMeet.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeet.h; sourceTree = ""; }; 0BD906E91EC0C00300C8C18E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 6C31EDC720C06D490089C899 /* recordingOn.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = recordingOn.mp3; path = ../../sounds/recordingOn.mp3; sourceTree = ""; }; @@ -89,6 +90,7 @@ 75635B0820751D6D00F29C9F /* joined.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = joined.wav; path = ../../sounds/joined.wav; sourceTree = ""; }; 75635B0920751D6D00F29C9F /* left.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = left.wav; path = ../../sounds/left.wav; sourceTree = ""; }; 87FE6F3221E52437004A5DC7 /* incomingMessage.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = incomingMessage.wav; path = ../../sounds/incomingMessage.wav; sourceTree = ""; }; + 891FE43DAD30BC8976683100 /* Pods-JitsiMeetSDK.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeetSDK.release.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeetSDK/Pods-JitsiMeetSDK.release.xcconfig"; sourceTree = ""; }; 98E09B5C73D9036B4ED252FC /* Pods-JitsiMeet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.debug.xcconfig"; sourceTree = ""; }; 9C77CA3CC919B081F1A52982 /* Pods-JitsiMeet.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-JitsiMeet.release.xcconfig"; path = "../Pods/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet.release.xcconfig"; sourceTree = ""; }; A4414ADF20B37F1A003546E6 /* rejected.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; name = rejected.wav; path = ../../sounds/rejected.wav; sourceTree = ""; }; @@ -118,6 +120,7 @@ DE81A2D72316AC7600AE1940 /* LogBridge.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LogBridge.m; sourceTree = ""; }; DE81A2DC2317ED5400AE1940 /* JitsiMeetBaseLogHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeetBaseLogHandler.h; sourceTree = ""; }; DE81A2DD2317ED5400AE1940 /* JitsiMeetBaseLogHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JitsiMeetBaseLogHandler.m; sourceTree = ""; }; + DEA9F283258A5D9900D4CD74 /* JitsiMeetSDK.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeetSDK.h; sourceTree = ""; }; DEAD3224220C497000E93636 /* JitsiMeetConferenceOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JitsiMeetConferenceOptions.h; sourceTree = ""; }; DEAD3225220C497000E93636 /* JitsiMeetConferenceOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JitsiMeetConferenceOptions.m; sourceTree = ""; }; DEAD3228220C734300E93636 /* JitsiMeetConferenceOptions+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JitsiMeetConferenceOptions+Private.h"; sourceTree = ""; }; @@ -128,6 +131,7 @@ DEFE535521FB2E8300011A3A /* ReactUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ReactUtils.m; sourceTree = ""; }; DEFE535721FB2E9E00011A3A /* ReactUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ReactUtils.h; sourceTree = ""; }; DEFE535821FB311F00011A3A /* JitsiMeet+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "JitsiMeet+Private.h"; sourceTree = ""; }; + E4376CA6886DE68FD7A4294B /* libPods-JitsiMeetSDK.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-JitsiMeetSDK.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -137,7 +141,7 @@ files = ( 0BB9AD791F5EC6D7001C08DB /* Intents.framework in Frameworks */, 0BB9AD771F5EC6CE001C08DB /* CallKit.framework in Frameworks */, - 0F65EECE1D95DA94561BB47E /* libPods-JitsiMeet.a in Frameworks */, + 6F08DF7D4458EE3CF3F36F6D /* libPods-JitsiMeetSDK.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -178,7 +182,7 @@ 0BD906E61EC0C00300C8C18E /* Products */ = { isa = PBXGroup; children = ( - 0BD906E51EC0C00300C8C18E /* JitsiMeet.framework */, + 0BD906E51EC0C00300C8C18E /* JitsiMeetSDK.framework */, ); name = Products; sourceTree = ""; @@ -196,6 +200,7 @@ DE438CD82350934700DD541D /* JavaScriptSandbox.m */, 0BD906E81EC0C00300C8C18E /* JitsiMeet.h */, DEFE535821FB311F00011A3A /* JitsiMeet+Private.h */, + DEA9F283258A5D9900D4CD74 /* JitsiMeetSDK.h */, DEFE535321FB1BF800011A3A /* JitsiMeet.m */, DEAD3224220C497000E93636 /* JitsiMeetConferenceOptions.h */, DEAD3228220C734300E93636 /* JitsiMeetConferenceOptions+Private.h */, @@ -236,7 +241,7 @@ 0BB9AD761F5EC6CE001C08DB /* CallKit.framework */, 0B93EF7A1EC608550030D24D /* CoreText.framework */, 0BB9AD781F5EC6D7001C08DB /* Intents.framework */, - 03F2ADC957FF109849B7FCA1 /* libPods-JitsiMeet.a */, + E4376CA6886DE68FD7A4294B /* libPods-JitsiMeetSDK.a */, ); name = Frameworks; sourceTree = ""; @@ -264,6 +269,8 @@ children = ( 98E09B5C73D9036B4ED252FC /* Pods-JitsiMeet.debug.xcconfig */, 9C77CA3CC919B081F1A52982 /* Pods-JitsiMeet.release.xcconfig */, + 09A78016288AF50ACD28A10D /* Pods-JitsiMeetSDK.debug.xcconfig */, + 891FE43DAD30BC8976683100 /* Pods-JitsiMeetSDK.release.xcconfig */, ); name = Pods; sourceTree = ""; @@ -299,6 +306,7 @@ 0B412F181EDEC65D00B1A0A6 /* JitsiMeetView.h in Headers */, 0B93EF7E1EC9DDCD0030D24D /* RCTBridgeWrapper.h in Headers */, DE81A2DE2317ED5400AE1940 /* JitsiMeetBaseLogHandler.h in Headers */, + DEA9F284258A5D9900D4CD74 /* JitsiMeetSDK.h in Headers */, DE65AACC2318028300290BEC /* JitsiMeetBaseLogHandler+Private.h in Headers */, 0B412F221EDEF6EA00B1A0A6 /* JitsiMeetViewDelegate.h in Headers */, 0BD906EA1EC0C00300C8C18E /* JitsiMeet.h in Headers */, @@ -312,9 +320,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 0BD906E41EC0C00300C8C18E /* JitsiMeet */ = { + 0BD906E41EC0C00300C8C18E /* JitsiMeetSDK */ = { isa = PBXNativeTarget; - buildConfigurationList = 0BD906ED1EC0C00300C8C18E /* Build configuration list for PBXNativeTarget "JitsiMeet" */; + buildConfigurationList = 0BD906ED1EC0C00300C8C18E /* Build configuration list for PBXNativeTarget "JitsiMeetSDK" */; buildPhases = ( 26796D8589142D80C8AFDA51 /* [CP] Check Pods Manifest.lock */, 0BD906E01EC0C00300C8C18E /* Sources */, @@ -328,9 +336,9 @@ ); dependencies = ( ); - name = JitsiMeet; + name = JitsiMeetSDK; productName = "Jitsi Meet SDK"; - productReference = 0BD906E51EC0C00300C8C18E /* JitsiMeet.framework */; + productReference = 0BD906E51EC0C00300C8C18E /* JitsiMeetSDK.framework */; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -362,7 +370,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 0BD906E41EC0C00300C8C18E /* JitsiMeet */, + 0BD906E41EC0C00300C8C18E /* JitsiMeetSDK */, ); }; /* End PBXProject section */ @@ -416,7 +424,7 @@ ); name = "[CP] Check Pods Manifest.lock"; outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-JitsiMeet-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-JitsiMeetSDK-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -429,7 +437,7 @@ files = ( ); inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet-resources.sh", + "${PODS_ROOT}/Target Support Files/Pods-JitsiMeetSDK/Pods-JitsiMeetSDK-resources.sh", "${PODS_ROOT}/Amplitude-iOS/Amplitude/api.amplitude.com.der", "${PODS_ROOT}/Amplitude-iOS/Amplitude/ComodoCaLimitedRsaCertificationAuthority.der", "${PODS_ROOT}/Amplitude-iOS/Amplitude/ComodoRsaCA.der", @@ -446,7 +454,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-JitsiMeet/Pods-JitsiMeet-resources.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-JitsiMeetSDK/Pods-JitsiMeetSDK-resources.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -609,7 +617,7 @@ }; 0BD906EE1EC0C00300C8C18E /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 98E09B5C73D9036B4ED252FC /* Pods-JitsiMeet.debug.xcconfig */; + baseConfigurationReference = 09A78016288AF50ACD28A10D /* Pods-JitsiMeetSDK.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CLANG_ENABLE_MODULES = YES; @@ -636,7 +644,7 @@ }; 0BD906EF1EC0C00300C8C18E /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9C77CA3CC919B081F1A52982 /* Pods-JitsiMeet.release.xcconfig */; + baseConfigurationReference = 891FE43DAD30BC8976683100 /* Pods-JitsiMeetSDK.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CLANG_ENABLE_MODULES = YES; @@ -672,7 +680,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 0BD906ED1EC0C00300C8C18E /* Build configuration list for PBXNativeTarget "JitsiMeet" */ = { + 0BD906ED1EC0C00300C8C18E /* Build configuration list for PBXNativeTarget "JitsiMeetSDK" */ = { isa = XCConfigurationList; buildConfigurations = ( 0BD906EE1EC0C00300C8C18E /* Debug */, diff --git a/ios/sdk/sdk.xcodeproj/xcshareddata/xcschemes/JitsiMeet.xcscheme b/ios/sdk/sdk.xcodeproj/xcshareddata/xcschemes/JitsiMeetSDK.xcscheme similarity index 89% rename from ios/sdk/sdk.xcodeproj/xcshareddata/xcschemes/JitsiMeet.xcscheme rename to ios/sdk/sdk.xcodeproj/xcshareddata/xcschemes/JitsiMeetSDK.xcscheme index aa11b3ecb..779a9428c 100644 --- a/ios/sdk/sdk.xcodeproj/xcshareddata/xcschemes/JitsiMeet.xcscheme +++ b/ios/sdk/sdk.xcodeproj/xcshareddata/xcschemes/JitsiMeetSDK.xcscheme @@ -15,8 +15,8 @@ @@ -44,8 +44,8 @@ @@ -60,8 +60,8 @@ diff --git a/ios/sdk/src/Info.plist b/ios/sdk/src/Info.plist index a741acb82..ee73227ef 100644 --- a/ios/sdk/src/Info.plist +++ b/ios/sdk/src/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.12.0 + 3.0.0 CFBundleVersion $(CURRENT_PROJECT_VERSION) NSPrincipalClass diff --git a/ios/sdk/src/JitsiMeet.h b/ios/sdk/src/JitsiMeet.h index ac90f321a..0b5b7f430 100644 --- a/ios/sdk/src/JitsiMeet.h +++ b/ios/sdk/src/JitsiMeet.h @@ -1,6 +1,5 @@ /* - * Copyright @ 2018-present 8x8, Inc. - * Copyright @ 2017-2018 Atlassian Pty Ltd + * Copyright @ 2017-present 8x8, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,13 +14,10 @@ * limitations under the License. */ -#import -#import -#import -#import -#import -#import +@import UIKit; +@import Foundation; +#import @interface JitsiMeet : NSObject diff --git a/ios/sdk/src/JitsiMeetSDK.h b/ios/sdk/src/JitsiMeetSDK.h new file mode 100644 index 000000000..6ff9e6649 --- /dev/null +++ b/ios/sdk/src/JitsiMeetSDK.h @@ -0,0 +1,23 @@ +/* + * Copyright @ 2020-present 8x8, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#import +#import +#import +#import +#import +#import +#import diff --git a/ios/sdk/src/callkit/CallKit.m b/ios/sdk/src/callkit/CallKit.m index f1cd64fab..ac49b28bf 100644 --- a/ios/sdk/src/callkit/CallKit.m +++ b/ios/sdk/src/callkit/CallKit.m @@ -28,9 +28,9 @@ #import #import -#import +#import -#import "LogUtils.h" +#import "../LogUtils.h" // The events emitted/supported by RNCallKit: diff --git a/ios/sdk/src/picture-in-picture/DragGestureController.swift b/ios/sdk/src/picture-in-picture/DragGestureController.swift index 88f9e27ab..a6938ddae 100644 --- a/ios/sdk/src/picture-in-picture/DragGestureController.swift +++ b/ios/sdk/src/picture-in-picture/DragGestureController.swift @@ -14,6 +14,8 @@ * limitations under the License. */ +import UIKit + final class DragGestureController { var insets: UIEdgeInsets = UIEdgeInsets.zero diff --git a/ios/sdk/src/picture-in-picture/PiPViewCoordinator.swift b/ios/sdk/src/picture-in-picture/PiPViewCoordinator.swift index 57c8b46ac..06310aeef 100644 --- a/ios/sdk/src/picture-in-picture/PiPViewCoordinator.swift +++ b/ios/sdk/src/picture-in-picture/PiPViewCoordinator.swift @@ -14,6 +14,8 @@ * limitations under the License. */ +import UIKit + public typealias AnimationCompletion = (Bool) -> Void public protocol PiPViewCoordinatorDelegate: class {