Merge branch 'develop'

webex · Sep 27, 2020 · fe6adde · fe6adde
2 parents 8e8629a + 7a820f4
commit fe6adde
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/Buddies.xcodeproj/project.pbxproj b/Buddies.xcodeproj/project.pbxproj
@@ -551,6 +551,7 @@
 				"${BUILT_PRODUCTS_DIR}/SwiftyJSON/SwiftyJSON.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",
@@ -573,6 +574,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyJSON.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Sbu.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Seu.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/util_ios.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wbxaecodec.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wbxaudioengine.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Wme.framework",
@@ -708,13 +710,13 @@
 				CODE_SIGN_ENTITLEMENTS = BuddiesBroadcastExtension/BuddiesBroadcastExtension.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2500;
+				CURRENT_PROJECT_VERSION = 2600;
 				DEVELOPMENT_TEAM = 9X38D433RE;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "$(SRCROOT)/BuddiesBroadcastExtension/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.4;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 2.5.0;
+				MARKETING_VERSION = 2.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cisco.webexsdk.Sweetie.BuddiesBroadcastExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -733,13 +735,13 @@
 				CODE_SIGN_ENTITLEMENTS = BuddiesBroadcastExtension/BuddiesBroadcastExtension.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2500;
+				CURRENT_PROJECT_VERSION = 2600;
 				DEVELOPMENT_TEAM = 9X38D433RE;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = "$(SRCROOT)/BuddiesBroadcastExtension/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.4;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				MARKETING_VERSION = 2.5.0;
+				MARKETING_VERSION = 2.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cisco.webexsdk.Sweetie.BuddiesBroadcastExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -871,12 +873,12 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2500;
+				CURRENT_PROJECT_VERSION = 2600;
 				DEVELOPMENT_TEAM = 9X38D433RE;
 				INFOPLIST_FILE = Buddies/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.5.0;
+				MARKETING_VERSION = 2.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cisco.webexsdk.Sweetie;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
@@ -896,12 +898,12 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2500;
+				CURRENT_PROJECT_VERSION = 2600;
 				DEVELOPMENT_TEAM = 9X38D433RE;
 				INFOPLIST_FILE = Buddies/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.5.0;
+				MARKETING_VERSION = 2.6.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.cisco.webexsdk.Sweetie;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";

diff --git a/Buddies/Controller/BaseViewControllers/MainViewController.swift b/Buddies/Controller/BaseViewControllers/MainViewController.swift
@@ -398,6 +398,8 @@ class MainViewController: UIViewController, UserOptionDelegate{
                     break
                 case .messageDeleted(_):
                     break
+                case .messageUpdated:
+                    break
                 }
             }
         }

diff --git a/Buddies/Controller/GuestSettingViewController.swift b/Buddies/Controller/GuestSettingViewController.swift
@@ -440,6 +440,8 @@ class GuestSettingViewController: BaseViewController,UITextViewDelegate,UITextFi
                     break
                 case .messageDeleted( _):
                     break
+                case .messageUpdated(messageId: let messageId, type: let type):
+                    break
                 }
             }
         }

diff --git a/Podfile b/Podfile
@@ -1,6 +1,6 @@
 source 'https://github.com/CocoaPods/Specs.git'
 
-platform :ios, '10.0'
+platform :ios, '11.0'
 use_frameworks!
 
 target 'Buddies' do
-Original file line number
+Diff line change
@@ Expand Up @@
                         break
                     case .messageDeleted(_):
                         break
+                    case .messageUpdated:
+                        break
                     }
                 }
             }
@@ Expand Down @@