Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@MrShiY
MrShiY committed Dec 10, 2020
2 parents 40585f7 + c745564 commit 68fecfa
Show file tree
Hide file tree
Showing 9 changed files with 287 additions and 94 deletions.
38 changes: 18 additions & 20 deletions KitchenSink.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -525,27 +525,25 @@
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-KitchenSink/Pods-KitchenSink-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
"${BUILT_PRODUCTS_DIR}/AlamofireObjectMapper/AlamofireObjectMapper.framework",
"${BUILT_PRODUCTS_DIR}/Cosmos/Cosmos.framework",
"${BUILT_PRODUCTS_DIR}/FontAwesome.swift/FontAwesome_swift.framework",
"${BUILT_PRODUCTS_DIR}/KeychainAccess/KeychainAccess.framework",
"${BUILT_PRODUCTS_DIR}/ObjectMapper/ObjectMapper.framework",
"${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",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AlamofireObjectMapper.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Cosmos.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FontAwesome_swift.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KeychainAccess.framework",
Expand Down Expand Up @@ -815,7 +813,7 @@
CODE_SIGN_ENTITLEMENTS = KitchenSink/KitchenSink.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2600;
CURRENT_PROJECT_VERSION = 2700;
DEVELOPMENT_TEAM = 9X38D433RE;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -825,7 +823,7 @@
INFOPLIST_FILE = KitchenSink/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 2.6.0;
MARKETING_VERSION = 2.7.0;
PRODUCT_BUNDLE_IDENTIFIER = com.cisco.webexsdk.KitchenSink;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -846,7 +844,7 @@
CODE_SIGN_ENTITLEMENTS = KitchenSink/KitchenSink.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2600;
CURRENT_PROJECT_VERSION = 2700;
DEVELOPMENT_TEAM = 9X38D433RE;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -856,7 +854,7 @@
INFOPLIST_FILE = KitchenSink/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 2.6.0;
MARKETING_VERSION = 2.7.0;
PRODUCT_BUNDLE_IDENTIFIER = com.cisco.webexsdk.KitchenSink;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -882,13 +880,13 @@
CODE_SIGN_ENTITLEMENTS = KitchenSinkBroadcastExtension/KitchenSinkBroadcastExtension.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2600;
CURRENT_PROJECT_VERSION = 2700;
DEVELOPMENT_TEAM = 9X38D433RE;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = KitchenSinkBroadcastExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 2.6.0;
MARKETING_VERSION = 2.7.0;
PRODUCT_BUNDLE_IDENTIFIER = com.cisco.webexsdk.KitchenSink.KitchenSinkBroadcastExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -916,13 +914,13 @@
CODE_SIGN_ENTITLEMENTS = KitchenSinkBroadcastExtension/KitchenSinkBroadcastExtension.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2600;
CURRENT_PROJECT_VERSION = 2700;
DEVELOPMENT_TEAM = 9X38D433RE;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = KitchenSinkBroadcastExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.2;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 2.6.0;
MARKETING_VERSION = 2.7.0;
PRODUCT_BUNDLE_IDENTIFIER = com.cisco.webexsdk.KitchenSink.KitchenSinkBroadcastExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -948,13 +946,13 @@
CODE_SIGN_ENTITLEMENTS = KitchenSinkBroadcastExtensionSetupUI/KitchenSinkBroadcastExtensionSetupUI.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2600;
CURRENT_PROJECT_VERSION = 2700;
DEVELOPMENT_TEAM = 9X38D433RE;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = KitchenSinkBroadcastExtensionSetupUI/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 2.6.0;
MARKETING_VERSION = 2.7.0;
PRODUCT_BUNDLE_IDENTIFIER = com.cisco.webexsdk.KitchenSink.KitchenSinkBroadcastExtensionUI;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand All @@ -980,13 +978,13 @@
CODE_SIGN_ENTITLEMENTS = KitchenSinkBroadcastExtensionSetupUI/KitchenSinkBroadcastExtensionSetupUI.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2600;
CURRENT_PROJECT_VERSION = 2700;
DEVELOPMENT_TEAM = 9X38D433RE;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = KitchenSinkBroadcastExtensionSetupUI/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
MARKETING_VERSION = 2.6.0;
MARKETING_VERSION = 2.7.0;
PRODUCT_BUNDLE_IDENTIFIER = com.cisco.webexsdk.KitchenSink.KitchenSinkBroadcastExtensionUI;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
Expand Down
Loading

0 comments on commit 68fecfa

Please sign in to comment.