Updated for Xcode 7

iflylabs · Sep 22, 2015 · 4af6a65 · 4af6a65
1 parent f12ecc6
commit 4af6a65
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 54 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/iFlyChatGlobalListView.xcodeproj/project.pbxproj b/iFlyChatGlobalListView.xcodeproj/project.pbxproj
@@ -9,7 +9,7 @@
 /* Begin PBXBuildFile section */
 		6E67430D1BA98F2900B03D5E /* ApplicationSettings.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E67430C1BA98F2900B03D5E /* ApplicationSettings.m */; };
 		6E6743101BA9910B00B03D5E /* ApplicationData.m in Sources */ = {isa = PBXBuildFile; fileRef = 6E67430F1BA9910B00B03D5E /* ApplicationData.m */; };
-		6EAEA1FB1B69F44B0042A11D /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EAEA1FA1B69F44B0042A11D /* libicucore.dylib */; };
+		6EA92D951BB151D8001A6B56 /* libicucore.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 6EA92D941BB151D8001A6B56 /* libicucore.tbd */; };
 		6EAEA2011B69F7970042A11D /* GlobalListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EAEA2001B69F7970042A11D /* GlobalListTableViewCell.m */; };
 		6EAEA2061B6A1ACF0042A11D /* RoomsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EAEA2051B6A1ACF0042A11D /* RoomsTableViewController.m */; };
 		6EAEA2091B6A26820042A11D /* DataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = 6EAEA2081B6A26820042A11D /* DataClass.m */; };
@@ -38,7 +38,7 @@
 		6E67430C1BA98F2900B03D5E /* ApplicationSettings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ApplicationSettings.m; sourceTree = "<group>"; };
 		6E67430E1BA9910B00B03D5E /* ApplicationData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ApplicationData.h; sourceTree = "<group>"; };
 		6E67430F1BA9910B00B03D5E /* ApplicationData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ApplicationData.m; sourceTree = "<group>"; };
-		6EAEA1FA1B69F44B0042A11D /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; };
+		6EA92D941BB151D8001A6B56 /* libicucore.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libicucore.tbd; path = usr/lib/libicucore.tbd; sourceTree = SDKROOT; };
 		6EAEA1FF1B69F7970042A11D /* GlobalListTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GlobalListTableViewCell.h; sourceTree = "<group>"; };
 		6EAEA2001B69F7970042A11D /* GlobalListTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GlobalListTableViewCell.m; sourceTree = "<group>"; };
 		6EAEA2041B6A1ACF0042A11D /* RoomsTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoomsTableViewController.h; sourceTree = "<group>"; };
@@ -66,7 +66,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				6EAEA1FB1B69F44B0042A11D /* libicucore.dylib in Frameworks */,
+				6EA92D951BB151D8001A6B56 /* libicucore.tbd in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -138,7 +138,7 @@
 		6ECB81171B68FA0B009E78EA = {
 			isa = PBXGroup;
 			children = (
-				6EAEA1FA1B69F44B0042A11D /* libicucore.dylib */,
+				6EA92D941BB151D8001A6B56 /* libicucore.tbd */,
 				6ECB81221B68FA0C009E78EA /* iFlyChatGlobalListView */,
 				6ECB813C1B68FA0C009E78EA /* iFlyChatGlobalListViewTests */,
 				6ECB81211B68FA0C009E78EA /* Products */,
@@ -243,7 +243,7 @@
 		6ECB81181B68FA0B009E78EA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0640;
+				LastUpgradeCheck = 0700;
 				ORGANIZATIONNAME = "Prateek Grover";
 				TargetAttributes = {
 					6ECB811F1B68FA0C009E78EA = {
@@ -370,6 +370,7 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -435,10 +436,12 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				FRAMEWORK_SEARCH_PATHS = "";
+				ENABLE_BITCODE = NO;
+				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)";
 				INFOPLIST_FILE = iFlyChatGlobalListView/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 7.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "iFlyLabs.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -448,10 +451,12 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				FRAMEWORK_SEARCH_PATHS = "";
+				ENABLE_BITCODE = NO;
+				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)";
 				INFOPLIST_FILE = iFlyChatGlobalListView/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 7.1;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "iFlyLabs.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -461,16 +466,14 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = iFlyChatGlobalListViewTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "iFlyLabs.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iFlyChatGlobalListView.app/iFlyChatGlobalListView";
 			};
@@ -480,12 +483,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-				);
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = iFlyChatGlobalListViewTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = "iFlyLabs.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/iFlyChatGlobalListView.app/iFlyChatGlobalListView";
 			};

diff --git a/...obalListView.xcodeproj/project.xcworkspace/xcshareddata/iFlyChatGlobalListView.xccheckout b/...obalListView.xcodeproj/project.xcworkspace/xcshareddata/iFlyChatGlobalListView.xccheckout
@@ -7,39 +7,27 @@
 	<key>IDESourceControlProjectIdentifier</key>
 	<string>E9934887-C5EF-431D-BFFB-7E21C46AE39A</string>
 	<key>IDESourceControlProjectName</key>
-	<string>iFlyChatGlobalListView</string>
+	<string>project</string>
 	<key>IDESourceControlProjectOriginsDictionary</key>
 	<dict>
-		<key>322866FA8C473CA4658BBB1544900BCC9A091D86</key>
-		<string>github.com:iflylabs/iflychat-ios-objc-chat-list-app.git</string>
 		<key>E0C3E0FECF75122A185BF33935AFEC19E252D8D1</key>
 		<string>github.com:iflylabs/iflychat-ios-sdk.git</string>
 	</dict>
 	<key>IDESourceControlProjectPath</key>
-	<string>iFlyChatGlobalListView.xcodeproj</string>
+	<string>iFlyChatExampleViews/iFlyChatExampleGlobalListView/iFlyChatGlobalListView.xcodeproj/project.xcworkspace</string>
 	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
 	<dict>
-		<key>322866FA8C473CA4658BBB1544900BCC9A091D86</key>
-		<string>../..</string>
 		<key>E0C3E0FECF75122A185BF33935AFEC19E252D8D1</key>
-		<string>../../../../GitHub%20Development%20Repository/iflychat-ios-sdk</string>
+		<string>../../../..</string>
 	</dict>
 	<key>IDESourceControlProjectURL</key>
-	<string>github.com:iflylabs/iflychat-ios-objc-chat-list-app.git</string>
+	<string>github.com:iflylabs/iflychat-ios-sdk.git</string>
 	<key>IDESourceControlProjectVersion</key>
 	<integer>111</integer>
 	<key>IDESourceControlProjectWCCIdentifier</key>
-	<string>322866FA8C473CA4658BBB1544900BCC9A091D86</string>
+	<string>E0C3E0FECF75122A185BF33935AFEC19E252D8D1</string>
 	<key>IDESourceControlProjectWCConfigurations</key>
 	<array>
-		<dict>
-			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
-			<string>public.vcs.git</string>
-			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>322866FA8C473CA4658BBB1544900BCC9A091D86</string>
-			<key>IDESourceControlWCCName</key>
-			<string>iflychat-ios-objc-chat-list-app</string>
-		</dict>
 		<dict>
 			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
 			<string>public.vcs.git</string>

diff --git a/...odeproj/project.xcworkspace/xcuserdata/prateek.xcuserdatad/UserInterfaceState.xcuserstate b/...odeproj/project.xcworkspace/xcuserdata/prateek.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/prateek.xcuserdatad/WorkspaceSettings.xcsettings b/...xcodeproj/project.xcworkspace/xcuserdata/prateek.xcuserdatad/WorkspaceSettings.xcsettings
diff --git a/...stView.xcodeproj/xcuserdata/prateek.xcuserdatad/xcschemes/iFlyChatGlobalListView.xcscheme b/...stView.xcodeproj/xcuserdata/prateek.xcuserdatad/xcschemes/iFlyChatGlobalListView.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0640"
+   LastUpgradeVersion = "0700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -37,10 +37,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -62,15 +62,18 @@
             ReferencedContainer = "container:iFlyChatGlobalListView.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
@@ -86,10 +89,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">

diff --git a/iFlyChatGlobalListView/.DS_Store b/iFlyChatGlobalListView/.DS_Store
diff --git a/iFlyChatGlobalListView/DataClass.m b/iFlyChatGlobalListView/DataClass.m
@@ -43,7 +43,7 @@ -(void) initiFlyChatLibrary
 
     //iFlyChatConfig object with server host, auth URL, SSL connection boolean and iFlyChatUserSession object. These are the basic configuration parameters used to connect to iFlyChat's servers
 
-    appData.config = [[iFlyChatConfig alloc] initIFlyChatConfigwithServerHost:@"serverhost.com" authUrl:@"http://example/auth/url" isHttps:NO userSession:appData.session];
+    appData.config = [[iFlyChatConfig alloc] initIFlyChatConfigwithServerHost:@"serverhost.com" authUrl:@"http://example.com/auth/url" isHttps:NO userSession:appData.session];
 
     //If auto reconnection is required, set it to "YES"
 

diff --git a/iFlyChatGlobalListView/Info.plist b/iFlyChatGlobalListView/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>iFlyLabs.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -22,6 +22,11 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>

diff --git a/iFlyChatGlobalListView/RoomsTableViewController.m b/iFlyChatGlobalListView/RoomsTableViewController.m
@@ -62,13 +62,13 @@ - (void)viewWillAppear:(BOOL)animated
     [self refreshRoomList];
 
     //Registering for the notification that will come from DataClass after library sends the updated Global List
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshRoomList) name:@"iFlyChat.updatedRoomList" object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshRoomList) name:@"onUpdatedGlobalList" object:nil];
 }
 
 - (void)viewDidDisappear: (BOOL)animated
 {
     //Removing the observer
-    [[NSNotificationCenter defaultCenter] removeObserver:self name:@"iFlyChat.updatedRoomList" object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:@"onUpdatedGlobalList" object:nil];
 }
 
 

diff --git a/iFlyChatGlobalListView/UsersTableViewController.m b/iFlyChatGlobalListView/UsersTableViewController.m
@@ -66,13 +66,13 @@ - (void)viewWillAppear:(BOOL)animated
     [self refreshUserList];
 
     //Registering for the notification that will come from DataClass after library sends the updated Global List
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshUserList) name:@"onUpdatedUserList" object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(refreshUserList) name:@"onUpdatedGlobalList" object:nil];
 }
 
 - (void)viewDidDisappear: (BOOL)animated{
 
     //Removing the observer
-    [[NSNotificationCenter defaultCenter] removeObserver:self name:@"onUpdatedUserList" object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:@"onUpdatedGlobalList" object:nil];
 
 }
 

diff --git a/iFlyChatGlobalListViewTests/Info.plist b/iFlyChatGlobalListViewTests/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>iFlyLabs.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>