From 2202d60d47a5f81d2e505f1c9485771a8f73a9b9 Mon Sep 17 00:00:00 2001 From: MrShiY <708984366@qq.com> Date: Thu, 15 Oct 2020 19:53:39 +0800 Subject: [PATCH 1/6] set IPHONEOS_DEPLOYMENT_TARGET of dependencies as the minimum version App supports. --- KitchenSink.xcodeproj/project.pbxproj | 12 ++++++------ Podfile | 9 ++++++++- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/KitchenSink.xcodeproj/project.pbxproj b/KitchenSink.xcodeproj/project.pbxproj index c0905cf..cbde4dd 100644 --- a/KitchenSink.xcodeproj/project.pbxproj +++ b/KitchenSink.xcodeproj/project.pbxproj @@ -533,12 +533,12 @@ "${BUILT_PRODUCTS_DIR}/Starscream/Starscream.framework", "${BUILT_PRODUCTS_DIR}/SwiftyJSON/SwiftyJSON.framework", "${BUILT_PRODUCTS_DIR}/Toast-Swift/Toast_Swift.framework", - "${PODS_ROOT}/../../webex-ios-sdk/Frameworks/Sbu.framework", - "${PODS_ROOT}/../../webex-ios-sdk/Frameworks/Seu.framework", - "${PODS_ROOT}/../../webex-ios-sdk/Frameworks/util_ios.framework", - "${PODS_ROOT}/../../webex-ios-sdk/Frameworks/wbxaecodec.framework", - "${PODS_ROOT}/../../webex-ios-sdk/Frameworks/wbxaudioengine.framework", - "${PODS_ROOT}/../../webex-ios-sdk/Frameworks/Wme.framework", + "${PODS_ROOT}/WebexSDK/Frameworks/Sbu.framework", + "${PODS_ROOT}/WebexSDK/Frameworks/Seu.framework", + "${PODS_ROOT}/WebexSDK/Frameworks/util_ios.framework", + "${PODS_ROOT}/WebexSDK/Frameworks/wbxaecodec.framework", + "${PODS_ROOT}/WebexSDK/Frameworks/wbxaudioengine.framework", + "${PODS_ROOT}/WebexSDK/Frameworks/Wme.framework", "${BUILT_PRODUCTS_DIR}/WebexSDK/WebexSDK.framework", "${BUILT_PRODUCTS_DIR}/WebexBroadcastExtensionKit/WebexBroadcastExtensionKit.framework", ); diff --git a/Podfile b/Podfile index b284794..3ce0a9a 100644 --- a/Podfile +++ b/Podfile @@ -8,12 +8,19 @@ post_install do |installer| config.build_settings.delete('CODE_SIGNING_ALLOWED') config.build_settings.delete('CODE_SIGNING_REQUIRED') end + installer.pods_project.targets.each do |target| + target.build_configurations.each do |config| + if Gem::Version.new('10.0') > Gem::Version.new(config.build_settings['IPHONEOS_DEPLOYMENT_TARGET']) + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '10.0' + end + end + end end target 'KitchenSink' do platform :ios, '10.0' - pod 'WebexSDK', :git => 'git@github.com:webex/webex-ios-sdk.git', :branch => 'develop' + pod 'WebexSDK' # pod 'WebexSDK', :path => '../webex-ios-sdk' pod 'Cosmos', '~> 15.0' pod 'Toast-Swift', '~> 5.0.0' From 22b1321a75398cae76c2142bb38d98d54d510e90 Mon Sep 17 00:00:00 2001 From: MrShiY <708984366@qq.com> Date: Tue, 20 Oct 2020 17:21:30 +0800 Subject: [PATCH 2/6] Support to list ongoing call and notify space call status --- KitchenSink/Base.lproj/Main.storyboard | 68 +++++++++++++------- KitchenSink/InitiateCallViewController.swift | 46 +++++++++++++ KitchenSink/SpaceTableViewCell.swift | 6 ++ Podfile | 2 +- 4 files changed, 99 insertions(+), 23 deletions(-) diff --git a/KitchenSink/Base.lproj/Main.storyboard b/KitchenSink/Base.lproj/Main.storyboard index 96b1ec7..f28a16a 100644 --- a/KitchenSink/Base.lproj/Main.storyboard +++ b/KitchenSink/Base.lproj/Main.storyboard @@ -1,9 +1,9 @@ - + - + @@ -275,7 +275,7 @@