diff --git a/.gitignore b/.gitignore index bb5adef..139fbe4 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,36 @@ android/keystores/debug.keystore # generated by bob lib/ + +# CocoaPods +Pods + + +###### apple files +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + diff --git a/example/ios/BigbluebuttonMobileSdkExample.xcodeproj/project.pbxproj b/example/ios/BigbluebuttonMobileSdkExample.xcodeproj/project.pbxproj index 0904f50..c328847 100644 --- a/example/ios/BigbluebuttonMobileSdkExample.xcodeproj/project.pbxproj +++ b/example/ios/BigbluebuttonMobileSdkExample.xcodeproj/project.pbxproj @@ -137,7 +137,6 @@ 47F7ED3B7971BE374F7B8635 /* Pods-BigbluebuttonMobileSdkExample.debug.xcconfig */, E00ACF0FDA8BF921659E2F9A /* Pods-BigbluebuttonMobileSdkExample.release.xcconfig */, ); - name = Pods; path = Pods; sourceTree = ""; }; @@ -206,7 +205,6 @@ 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, C1D60D28B925C94BD88E79D7 /* [CP] Copy Pods Resources */, - 0194AED5E13DAEE1FA3525DB /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -350,24 +348,6 @@ shellPath = /bin/sh; shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh"; }; - 0194AED5E13DAEE1FA3525DB /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-BigbluebuttonMobileSdkExample/Pods-BigbluebuttonMobileSdkExample-frameworks.sh", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-BigbluebuttonMobileSdkExample/Pods-BigbluebuttonMobileSdkExample-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 2D02E4CB1E0B4B27006451C7 /* Bundle React Native Code And Images */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -621,7 +601,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.0; + TVOS_DEPLOYMENT_TARGET = 14.0; }; name = Debug; }; @@ -648,7 +628,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 10.0; + TVOS_DEPLOYMENT_TARGET = 14.0; }; name = Release; }; @@ -751,7 +731,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)"; LIBRARY_SEARCH_PATHS = ( "\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"", @@ -804,7 +784,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)"; LIBRARY_SEARCH_PATHS = ( "\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"", diff --git a/example/ios/Podfile b/example/ios/Podfile index 2d99f37..568ab12 100644 --- a/example/ios/Podfile +++ b/example/ios/Podfile @@ -1,7 +1,7 @@ require_relative '../node_modules/react-native/scripts/react_native_pods' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' -platform :ios, '10.0' +platform :ios, '14.0' target 'BigbluebuttonMobileSdkExample' do config = use_native_modules! @@ -14,7 +14,7 @@ target 'BigbluebuttonMobileSdkExample' do # # Note that if you have use_frameworks! enabled, Flipper will not work and # you should disable these next few lines. - use_flipper!({ 'Flipper' => '0.80.0' }) + # use_flipper!({ 'Flipper' => '0.80.0' }) post_install do |installer| flipper_post_install(installer) end diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index d31596d..8df1719 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -2,7 +2,6 @@ PODS: - bigbluebutton-mobile-sdk (0.1.0): - React-Core - boost-for-react-native (1.63.0) - - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - FBLazyVector (0.63.4) - FBReactNativeSpec (0.63.4): @@ -12,55 +11,6 @@ PODS: - React-Core (= 0.63.4) - React-jsi (= 0.63.4) - ReactCommon/turbomodule/core (= 0.63.4) - - Flipper (0.80.0): - - Flipper-Folly (~> 2.5) - - Flipper-RSocket (~> 1.3) - - Flipper-Boost-iOSX (1.76.0.1.11) - - Flipper-DoubleConversion (1.1.7) - - Flipper-Fmt (7.1.7) - - Flipper-Folly (2.6.10): - - Flipper-Boost-iOSX - - Flipper-DoubleConversion - - Flipper-Fmt (= 7.1.7) - - Flipper-Glog - - libevent (~> 2.1.12) - - OpenSSL-Universal (= 1.1.1100) - - Flipper-Glog (0.3.6) - - Flipper-PeerTalk (0.0.4) - - Flipper-RSocket (1.4.3): - - Flipper-Folly (~> 2.6) - - FlipperKit (0.80.0): - - FlipperKit/Core (= 0.80.0) - - FlipperKit/Core (0.80.0): - - Flipper (~> 0.80.0) - - FlipperKit/CppBridge - - FlipperKit/FBCxxFollyDynamicConvert - - FlipperKit/FBDefines - - FlipperKit/FKPortForwarding - - FlipperKit/CppBridge (0.80.0): - - Flipper (~> 0.80.0) - - FlipperKit/FBCxxFollyDynamicConvert (0.80.0): - - Flipper-Folly (~> 2.5) - - FlipperKit/FBDefines (0.80.0) - - FlipperKit/FKPortForwarding (0.80.0): - - CocoaAsyncSocket (~> 7.6) - - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitHighlightOverlay (0.80.0) - - FlipperKit/FlipperKitLayoutPlugin (0.80.0): - - FlipperKit/Core - - FlipperKit/FlipperKitHighlightOverlay - - FlipperKit/FlipperKitLayoutTextSearchable - - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutTextSearchable (0.80.0) - - FlipperKit/FlipperKitNetworkPlugin (0.80.0): - - FlipperKit/Core - - FlipperKit/FlipperKitReactPlugin (0.80.0): - - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.80.0): - - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.80.0): - - FlipperKit/Core - - FlipperKit/FlipperKitNetworkPlugin - Folly (2020.01.13.00): - boost-for-react-native - DoubleConversion @@ -71,8 +21,6 @@ PODS: - DoubleConversion - glog - glog (0.3.5) - - libevent (2.1.12) - - OpenSSL-Universal (1.1.1100) - RCTRequired (0.63.4) - RCTTypeSafety (0.63.4): - FBLazyVector (= 0.63.4) @@ -300,33 +248,12 @@ PODS: - React-cxxreact (= 0.63.4) - React-jsi (= 0.63.4) - Yoga (1.14.0) - - YogaKit (1.18.1): - - Yoga (~> 1.14) DEPENDENCIES: - bigbluebutton-mobile-sdk (from `../..`) - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`) - - Flipper (= 0.80.0) - - Flipper-DoubleConversion (= 1.1.7) - - Flipper-Folly (~> 2.2) - - Flipper-Glog (= 0.3.6) - - Flipper-PeerTalk (~> 0.0.4) - - Flipper-RSocket (~> 1.1) - - FlipperKit (= 0.80.0) - - FlipperKit/Core (= 0.80.0) - - FlipperKit/CppBridge (= 0.80.0) - - FlipperKit/FBCxxFollyDynamicConvert (= 0.80.0) - - FlipperKit/FBDefines (= 0.80.0) - - FlipperKit/FKPortForwarding (= 0.80.0) - - FlipperKit/FlipperKitHighlightOverlay (= 0.80.0) - - FlipperKit/FlipperKitLayoutPlugin (= 0.80.0) - - FlipperKit/FlipperKitLayoutTextSearchable (= 0.80.0) - - FlipperKit/FlipperKitNetworkPlugin (= 0.80.0) - - FlipperKit/FlipperKitReactPlugin (= 0.80.0) - - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.80.0) - - FlipperKit/SKIOSNetworkPlugin (= 0.80.0) - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) @@ -356,19 +283,6 @@ DEPENDENCIES: SPEC REPOS: trunk: - boost-for-react-native - - CocoaAsyncSocket - - Flipper - - Flipper-Boost-iOSX - - Flipper-DoubleConversion - - Flipper-Fmt - - Flipper-Folly - - Flipper-Glog - - Flipper-PeerTalk - - Flipper-RSocket - - FlipperKit - - libevent - - OpenSSL-Universal - - YogaKit EXTERNAL SOURCES: bigbluebutton-mobile-sdk: @@ -429,23 +343,11 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: bigbluebutton-mobile-sdk: c7967d095a1aeaae6dd6fc31c4c0a7b0327f88a0 boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c - CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: cde416483dac037923206447da6e1454df403714 FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e FBReactNativeSpec: f2c97f2529dd79c083355182cc158c9f98f4bd6e - Flipper: ed161911b24ac3f237ed57febeed5d71d432d9bf - Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c - Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 - Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b - Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3 - Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 - Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 - Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 - FlipperKit: 57764956d2f0f972c1af5075a9c8f05ca5b12349 Folly: b73c3869541e86821df3c387eb0af5f65addfab4 glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3 - libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 - OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCTRequired: 082f10cd3f905d6c124597fd1c14f6f2655ff65e RCTTypeSafety: 8c9c544ecbf20337d069e4ae7fd9a377aadf504b React: b0a957a2c44da4113b0c4c9853d8387f8e64e615 @@ -467,8 +369,7 @@ SPEC CHECKSUMS: React-RCTVibration: ae4f914cfe8de7d4de95ae1ea6cc8f6315d73d9d ReactCommon: 73d79c7039f473b76db6ff7c6b159c478acbbb3b Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6 - YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: ba17b64de1dd6a21f238ef9f8cf89fde6a55aaf8 +PODFILE CHECKSUM: e84704278155bd10d2637b20fd1b1519bedb0c00 COCOAPODS: 1.11.2 diff --git a/ios/BigbluebuttonMobileSdk.xcodeproj/project.pbxproj b/ios/BigbluebuttonMobileSdk.xcodeproj/project.pbxproj index 960a354..ff90dd4 100644 --- a/ios/BigbluebuttonMobileSdk.xcodeproj/project.pbxproj +++ b/ios/BigbluebuttonMobileSdk.xcodeproj/project.pbxproj @@ -7,10 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - - 5E555C0D2413F4C50049A1A2 /* BigbluebuttonMobileSdk.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* BigbluebuttonMobileSdk.m */; }; - F4FF95D7245B92E800C19C63 /* BigbluebuttonMobileSdk.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4FF95D6245B92E800C19C63 /* BigbluebuttonMobileSdk.swift */; }; - + F4FF95D7245B92E800C19C63 /* BigbluebuttonMobileSdk.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4FF95D6245B92E800C19C63 /* BigbluebuttonMobileSdk.swift */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -27,11 +24,9 @@ /* Begin PBXFileReference section */ 134814201AA4EA6300B7C361 /* libBigbluebuttonMobileSdk.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libBigbluebuttonMobileSdk.a; sourceTree = BUILT_PRODUCTS_DIR; }; - B3E7B5891CC2AC0600A0062D /* BigbluebuttonMobileSdk.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BigbluebuttonMobileSdk.m; sourceTree = ""; }; F4FF95D5245B92E700C19C63 /* BigbluebuttonMobileSdk-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "BigbluebuttonMobileSdk-Bridging-Header.h"; sourceTree = ""; }; F4FF95D6245B92E800C19C63 /* BigbluebuttonMobileSdk.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BigbluebuttonMobileSdk.swift; sourceTree = ""; }; - /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -56,11 +51,9 @@ 58B511D21A9E6C8500147676 = { isa = PBXGroup; children = ( - F4FF95D6245B92E800C19C63 /* BigbluebuttonMobileSdk.swift */, B3E7B5891CC2AC0600A0062D /* BigbluebuttonMobileSdk.m */, F4FF95D5245B92E700C19C63 /* BigbluebuttonMobileSdk-Bridging-Header.h */, - 134814211AA4EA7D00B7C361 /* Products */, ); sourceTree = ""; @@ -122,10 +115,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - F4FF95D7245B92E800C19C63 /* BigbluebuttonMobileSdk.swift in Sources */, - B3E7B58A1CC2AC0600A0062D /* BigbluebuttonMobileSdk.m in Sources */, - ); runOnlyForDeploymentPostprocessing = 0; }; @@ -175,7 +165,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -218,7 +208,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 14.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; @@ -238,11 +228,9 @@ OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = BigbluebuttonMobileSdk; SKIP_INSTALL = YES; - SWIFT_OBJC_BRIDGING_HEADER = "BigbluebuttonMobileSdk-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - }; name = Debug; }; @@ -259,10 +247,8 @@ OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = BigbluebuttonMobileSdk; SKIP_INSTALL = YES; - SWIFT_OBJC_BRIDGING_HEADER = "BigbluebuttonMobileSdk-Bridging-Header.h"; SWIFT_VERSION = 5.0; - }; name = Release; };