Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
iOS 7.1 updates
  • Loading branch information
David Jedeikin committed Mar 18, 2014
1 parent ac7625e commit 68cc321
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Makefile
Expand Up @@ -4,8 +4,8 @@ pods:
pod install

test:
SZEventTrackingDisabled=1 WRITE_JUNIT_XML=YES RUN_CLI=1 GHUNIT_CLI=1 xcodebuild -workspace Socialize.xcworkspace -scheme UnitTests -configuration Debug -sdk iphonesimulator -destination OS="latest",name="iPhone Retina (4-inch)"
SZEventTrackingDisabled=1 WRITE_JUNIT_XML=YES RUN_CLI=1 GHUNIT_CLI=1 xcodebuild -workspace Socialize.xcworkspace -scheme UnitTests -configuration Debug -sdk iphonesimulator -destination OS="6.1",name="iPhone Retina (4-inch)"
SZEventTrackingDisabled=1 WRITE_JUNIT_XML=YES RUN_CLI=1 GHUNIT_CLI=1 xcodebuild -workspace Socialize.xcworkspace -scheme UnitTests -configuration Debug -sdk iphonesimulator -destination OS=7.0,name="iPhone Retina (4-inch)"
SZEventTrackingDisabled=1 WRITE_JUNIT_XML=YES RUN_CLI=1 GHUNIT_CLI=1 xcodebuild -workspace Socialize.xcworkspace -scheme UnitTests -configuration Debug -sdk iphonesimulator -destination OS=6.1,name="iPhone Retina (4-inch)"

default: build buildsample test package

Expand Down
1 change: 1 addition & 0 deletions Socialize-noarc/SocializeAuthenticateService.m
Expand Up @@ -16,6 +16,7 @@
#import "socialize_globals.h"
#import "NSData+Base64.h"
#import "ASIdentifierManager+Utilities.h"
#import "SZAPIClientHelpers.h"

static NSString *SZDefaultUDID = @"105105105105";

Expand Down
1 change: 1 addition & 0 deletions Socialize-noarc/SocializeCommentsService.m
Expand Up @@ -30,6 +30,7 @@
#import "SocializeCommentJSONFormatter.h"
#import "SocializeObjectFactory.h"
#import "socialize_globals.h"
#import "SZAPIClientHelpers.h"

#define COMMENTS_LIST_METHOD @"comment/"

Expand Down
1 change: 1 addition & 0 deletions Socialize-noarc/SocializeEntityService.m
Expand Up @@ -29,6 +29,7 @@
#import "SocializeObjectFactory.h"
#import "SocializeEntity.h"
#import "socialize_globals.h"
#import "SZAPIClientHelpers.h"

#define ENTITY_GET_ENDPOINT @"entity/"
#define ENTITY_CREATE_ENDPOINT @"entity/"
Expand Down
1 change: 1 addition & 0 deletions Socialize-noarc/SocializeEventService.m
Expand Up @@ -9,6 +9,7 @@
#import "SocializeEventService.h"
#import <Socialize/Socialize.h>
#import "socialize_globals.h"
#import "SZAPIClientHelpers.h"

#define EVENT_METHOD @"private/sdk_event/"

Expand Down
2 changes: 2 additions & 0 deletions Socialize-noarc/SocializeLikeService.m
Expand Up @@ -12,6 +12,8 @@
#import "SocializeObjectFactory.h"
#import "SocializeEntity.h"
#import "socialize_globals.h"
#import "SZAPIClientHelpers.h"


#define LIKE_METHOD @"like/"
#define ENTRY_KEY @"key"
Expand Down
1 change: 1 addition & 0 deletions Socialize-noarc/SocializeUserService.m
Expand Up @@ -34,6 +34,7 @@
#import "SocializeShare.h"
#import "SocializeView.h"
#import "socialize_globals.h"
#import "SZAPIClientHelpers.h"

#define USER_GET_ENDPOINT @"user/"
#define USER_POST_ENDPOINT(userid) [NSString stringWithFormat:@"user/%d/", userid]
Expand Down
1 change: 1 addition & 0 deletions Socialize-noarc/SocializeViewService.m
Expand Up @@ -9,6 +9,7 @@
#import "SocializeViewService.h"
#import "SocializeEntity.h"
#import "socialize_globals.h"
#import "SZAPIClientHelpers.h"

#define VIEW_METHOD @"view/"
#define ENTRY_KEY @"key"
Expand Down
9 changes: 8 additions & 1 deletion Socialize.xcodeproj/project.pbxproj
Expand Up @@ -4389,6 +4389,9 @@
487047C417EEFB03008D5741 = {
TestTargetID = AA00858F158D2B1100480399;
};
AA00858F158D2B1100480399 = {
DevelopmentTeam = 6QWWQR8948;
};
};
};
buildConfigurationList = AA00858A158D2B1100480399 /* Build configuration list for PBXProject "Socialize" */;
Expand Down Expand Up @@ -6246,6 +6249,8 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 591BC9DD5AC34F3A94039250 /* Pods.xcconfig */;
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/ThirdParty\"/**",
Expand All @@ -6263,6 +6268,7 @@
"-all_load",
);
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
WRAPPER_EXTENSION = app;
};
name = Debug;
Expand All @@ -6271,7 +6277,8 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 591BC9DD5AC34F3A94039250 /* Pods.xcconfig */;
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/ThirdParty\"/**",
Expand Down
12 changes: 6 additions & 6 deletions Socialize/SZAPIClientHelpers.h
Expand Up @@ -9,9 +9,9 @@
#import <Foundation/Foundation.h>
#import "SocializeObjects.h"

id SZUnarchiveUser(Protocol* protocol);
void SZHandleUserChange(id<SZFullUser> fullUser);
NSString *SZAPINSStringFromSZResultSorting(SZResultSorting sorting);
BOOL SZUseProductionPush();
void SZPostActivityEntityDidChangeNotifications(NSArray *activities);
BOOL SZEventTrackingDisabled();
extern id SZUnarchiveUser(Protocol* protocol);
extern void SZHandleUserChange(id<SZFullUser> fullUser);
extern NSString *SZAPINSStringFromSZResultSorting(SZResultSorting sorting);
extern BOOL SZUseProductionPush();
extern void SZPostActivityEntityDidChangeNotifications(NSArray *activities);
extern BOOL SZEventTrackingDisabled();
1 change: 1 addition & 0 deletions Socialize/SZEventUtils.m
Expand Up @@ -10,6 +10,7 @@
#import "_Socialize.h"
#import "socialize_globals.h"
#import "SDKHelpers.h"
#import "SZAPIClientHelpers.h"

@implementation SZEventUtils

Expand Down

0 comments on commit 68cc321

Please sign in to comment.