Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into develop
Browse files Browse the repository at this point in the history 
Conflicts:
	Simperium-OSX/Simperium-OSX.xcodeproj/project.pbxproj
	Simperium.xcodeproj/project.pbxproj
	Simperium/DDFileLogger+Simperium.h
	Simperium/DDFileLogger+Simperium.m
	Simperium/SPNetworkInterface.h
	Simperium/SPSimperiumLogger.h
	Simperium/SPSimperiumLogger.m
	Simperium/SPWebSocketInterface.m
	Simperium/Simperium.m
  • Loading branch information
@jleandroperez
jleandroperez committed Dec 27, 2013
2 parents 4a7e646 + aa0a391 commit 27fa486
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 11 deletions.
16 changes: 16 additions & 0 deletions Simperium-OSX/Simperium-OSX.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,10 @@
B56B16541835682500E45C98 /* TestObject.m in Sources */ = {isa = PBXBuildFile; fileRef = B56B164F1835682500E45C98 /* TestObject.m */; };
B59AAC95185B90F000B557D3 /* SPThreadsafeMutableSet.h in Headers */ = {isa = PBXBuildFile; fileRef = B59AAC93185B90F000B557D3 /* SPThreadsafeMutableSet.h */; };
B59AAC96185B90F000B557D3 /* SPThreadsafeMutableSet.m in Sources */ = {isa = PBXBuildFile; fileRef = B59AAC94185B90F000B557D3 /* SPThreadsafeMutableSet.m */; };
B59C751F186DAB0E003A1C8D /* DeletionCascadeTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B59C751E186DAB0E003A1C8D /* DeletionCascadeTest.m */; };
B59C7521186DAB29003A1C8D /* SPThreadsafeMutableSetTests.m in Sources */ = {isa = PBXBuildFile; fileRef = B59C7520186DAB29003A1C8D /* SPThreadsafeMutableSetTests.m */; };
B59C7523186DAB42003A1C8D /* DiffMatchPatchTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B59C7522186DAB42003A1C8D /* DiffMatchPatchTest.m */; };
B59C7525186DAB70003A1C8D /* SPBucket+Internals.h in Headers */ = {isa = PBXBuildFile; fileRef = B59C7524186DAB70003A1C8D /* SPBucket+Internals.h */; };
B5D581BF183565A700B08996 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B5D581BE183565A700B08996 /* XCTest.framework */; };
B5D581C5183565A700B08996 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = B5D581C3183565A700B08996 /* InfoPlist.strings */; };
B5D581D0183565C500B08996 /* XCTestCase+Simperium.m in Sources */ = {isa = PBXBuildFile; fileRef = B5D581CF183565C500B08996 /* XCTestCase+Simperium.m */; };
Expand Down Expand Up @@ -382,6 +386,10 @@
B56B164F1835682500E45C98 /* TestObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TestObject.m; path = ../../SimperiumTests/TestObject.m; sourceTree = "<group>"; };
B59AAC93185B90F000B557D3 /* SPThreadsafeMutableSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SPThreadsafeMutableSet.h; path = ../../Simperium/SPThreadsafeMutableSet.h; sourceTree = "<group>"; };
B59AAC94185B90F000B557D3 /* SPThreadsafeMutableSet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SPThreadsafeMutableSet.m; path = ../../Simperium/SPThreadsafeMutableSet.m; sourceTree = "<group>"; };
B59C751E186DAB0E003A1C8D /* DeletionCascadeTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DeletionCascadeTest.m; path = ../../SimperiumTests/DeletionCascadeTest.m; sourceTree = "<group>"; };
B59C7520186DAB29003A1C8D /* SPThreadsafeMutableSetTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SPThreadsafeMutableSetTests.m; path = ../../SimperiumTests/SPThreadsafeMutableSetTests.m; sourceTree = "<group>"; };
B59C7522186DAB42003A1C8D /* DiffMatchPatchTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DiffMatchPatchTest.m; path = ../../SimperiumTests/DiffMatchPatchTest.m; sourceTree = "<group>"; };
B59C7524186DAB70003A1C8D /* SPBucket+Internals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SPBucket+Internals.h"; path = "../../Simperium/SPBucket+Internals.h"; sourceTree = "<group>"; };
B5D581BD183565A700B08996 /* Simperium-OSX Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Simperium-OSX Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
B5D581BE183565A700B08996 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
B5D581C2183565A700B08996 /* Simperium-OSX Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Simperium-OSX Tests-Info.plist"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -488,6 +496,7 @@
B56B163D183566B800E45C98 /* SPDictionaryStorage.h */,
B56B163E183566B800E45C98 /* SPDictionaryStorage.m */,
2698BE3915C908C60020565F /* SPBucket.h */,
B59C7524186DAB70003A1C8D /* SPBucket+Internals.h */,
2698BE3A15C908C60020565F /* SPBucket.m */,
2698BE3B15C908C70020565F /* SPDiffable.h */,
2698BE3C15C908C70020565F /* SPDiffer.h */,
Expand Down Expand Up @@ -769,9 +778,12 @@
B5D581E21835660000B08996 /* UnitTests */ = {
isa = PBXGroup;
children = (
B59C7522186DAB42003A1C8D /* DiffMatchPatchTest.m */,
B5D581DC183565FB00B08996 /* DiffMatchPatchArrayTests.m */,
B59C751E186DAB0E003A1C8D /* DeletionCascadeTest.m */,
B5D581DD183565FB00B08996 /* RemoteDebugTests.m */,
B5D581DE183565FB00B08996 /* SPDictionaryStorageTests.m */,
B59C7520186DAB29003A1C8D /* SPThreadsafeMutableSetTests.m */,
);
name = UnitTests;
sourceTree = "<group>";
Expand Down Expand Up @@ -877,6 +889,7 @@
46D5BC41174C2A9B0027DBAF /* SPRelationshipResolver.h in Headers */,
B5351590183AB8A300A91BCD /* SPProcessorNotificationNames.h in Headers */,
46EA1AEB17569EA0009AC5AA /* SPNetworkInterface.h in Headers */,
B59C7525186DAB70003A1C8D /* SPBucket+Internals.h in Headers */,
46EA1AEE17569EB4009AC5AA /* SPWebSocketInterface.h in Headers */,
4617AEBB179A1A3400545BD9 /* SPReachability.h in Headers */,
46DD15C6179A6DAC0093678C /* SPMemberJSONList.h in Headers */,
Expand Down Expand Up @@ -1074,11 +1087,14 @@
B5D581DA183565E300B08996 /* MockWebSocketInterface.m in Sources */,
B5D581D9183565E300B08996 /* MockWebSocketChannel.m in Sources */,
B5D581DF183565FB00B08996 /* DiffMatchPatchArrayTests.m in Sources */,
B59C7523186DAB42003A1C8D /* DiffMatchPatchTest.m in Sources */,
B59C7521186DAB29003A1C8D /* SPThreadsafeMutableSetTests.m in Sources */,
B5D581D8183565E300B08996 /* MockSimperium.m in Sources */,
B56B16521835682500E45C98 /* Post.m in Sources */,
B5D581E1183565FB00B08996 /* SPDictionaryStorageTests.m in Sources */,
B5D581E0183565FB00B08996 /* RemoteDebugTests.m in Sources */,
B56B16511835682500E45C98 /* Config.m in Sources */,
B59C751F186DAB0E003A1C8D /* DeletionCascadeTest.m in Sources */,
B56B16541835682500E45C98 /* TestObject.m in Sources */,
B56B16501835682500E45C98 /* PostComment.m in Sources */,
);
Expand Down
2 changes: 1 addition & 1 deletion Simperium.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@
B52674701858EC4800A89D7A /* Simperium+Internals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Simperium+Internals.h"; sourceTree = "<group>"; };
B5549FE118457F72007EA226 /* SPThreadsafeMutableSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = SPThreadsafeMutableSet.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
B5549FE218457F72007EA226 /* SPThreadsafeMutableSet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SPThreadsafeMutableSet.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
B5549FE5184581BF007EA226 /* SPThreadsafeMutableSetTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SPThreadsafeMutableSetTests.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
B5549FE5184581BF007EA226 /* SPThreadsafeMutableSetTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = SPThreadsafeMutableSetTests.m; sourceTree = "<group>"; };
B565ECA71832940B00D162FF /* XCTestCase+Simperium.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "XCTestCase+Simperium.h"; sourceTree = "<group>"; };
B565ECA81832940B00D162FF /* XCTestCase+Simperium.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "XCTestCase+Simperium.m"; sourceTree = "<group>"; };
B597DD58183128FE005E95D7 /* RemoteDebugTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RemoteDebugTests.m; sourceTree = "<group>"; };
Expand Down
10 changes: 5 additions & 5 deletions SimperiumTests/DeletionCascadeTest.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ @implementation DeletionCascadeTest

- (void)testStress {
for (NSInteger i = 0; ++i <= kStressIterations; ) {
NSLog(@"<> Stress Iteration %d", i);
NSLog(@"<> Stress Iteration %ld", (long)i);
[self testInsertion];
[self testUpdates];
}
Expand All @@ -50,7 +50,7 @@ - (void)testInsertion
// Insert Posts
for (NSInteger i = 0; ++i <= kNumberOfPosts; ) {
Post* post = [storage insertNewObjectForBucketName:postBucket.name simperiumKey:nil];
post.title = [NSString stringWithFormat:@"Post [%d]", i];
post.title = [NSString stringWithFormat:@"Post [%ld]", (long)i];
[postKeys addObject:post.simperiumKey];

[storage save];
Expand All @@ -66,7 +66,7 @@ - (void)testInsertion
Post* post = [threadSafeStorage objectForKey:simperiumKey bucketName:postBucket.name];
for (NSInteger j = 0; ++j <= kCommentsPerPost; ) {
PostComment* comment = [threadSafeStorage insertNewObjectForBucketName:commentBucket.name simperiumKey:nil];
comment.content = [NSString stringWithFormat:@"Comment [%d]", j];
comment.content = [NSString stringWithFormat:@"Comment [%ld]", (long)j];
[post addCommentsObject:comment];
[commentKeys addObject:comment.simperiumKey];
}
Expand Down Expand Up @@ -119,7 +119,7 @@ - (void)testUpdates
// Insert Posts
for (NSInteger i = 0; ++i <= kNumberOfPosts; ) {
Post* post = [storage insertNewObjectForBucketName:postBucket.name simperiumKey:nil];
post.title = [NSString stringWithFormat:@"Post [%d]", i];
post.title = [NSString stringWithFormat:@"Post [%ld]", (long)i];
[postKeys addObject:post.simperiumKey];

[storage save];
Expand All @@ -130,7 +130,7 @@ - (void)testUpdates
Post* post = [storage objectForKey:simperiumKey bucketName:postBucket.name];
for (NSInteger j = 0; ++j <= kCommentsPerPost; ) {
PostComment* comment = [storage insertNewObjectForBucketName:commentBucket.name simperiumKey:nil];
comment.content = [NSString stringWithFormat:@"Comment [%d]", j];
comment.content = [NSString stringWithFormat:@"Comment [%ld]", (long)j];
[post addCommentsObject:comment];
[commentKeys addObject:comment.simperiumKey];
}
Expand Down
16 changes: 15 additions & 1 deletion samples/Simpletodo/Simpletodo.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
0CD3AD8D17A83A9800E9CCFE /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0CD3AD8C17A83A9800E9CCFE /* Default-568h@2x.png */; };
26156ACC14EC3D4C003332BA /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26156ACB14EC3D4C003332BA /* UIKit.framework */; };
26156ACE14EC3D4C003332BA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26156ACD14EC3D4C003332BA /* Foundation.framework */; };
26156AD014EC3D4C003332BA /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26156ACF14EC3D4C003332BA /* CoreGraphics.framework */; };
Expand All @@ -25,6 +26,7 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
0CD3AD8C17A83A9800E9CCFE /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
26156AC714EC3D4C003332BA /* Simpletodo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Simpletodo.app; sourceTree = BUILT_PRODUCTS_DIR; };
26156ACB14EC3D4C003332BA /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
26156ACD14EC3D4C003332BA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -67,6 +69,7 @@
26156ABC14EC3D4C003332BA = {
isa = PBXGroup;
children = (
0CD3AD8C17A83A9800E9CCFE /* Default-568h@2x.png */,
26C93A7214F86D1800BE99F5 /* icon.png */,
26C93A7314F86D1800BE99F5 /* icon@2x.png */,
26156AD314EC3D4C003332BA /* Simpletodo */,
Expand Down Expand Up @@ -150,7 +153,7 @@
26156ABE14EC3D4C003332BA /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0430;
LastUpgradeCheck = 0460;
};
buildConfigurationList = 26156AC114EC3D4C003332BA /* Build configuration list for PBXProject "Simpletodo" */;
compatibilityVersion = "Xcode 3.2";
Expand Down Expand Up @@ -179,6 +182,7 @@
26156AE414EC3D4C003332BA /* MainStoryboard_iPad.storyboard in Resources */,
26C93A7514F86D1800BE99F5 /* icon.png in Resources */,
26C93A7614F86D1800BE99F5 /* icon@2x.png in Resources */,
0CD3AD8D17A83A9800E9CCFE /* Default-568h@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -234,6 +238,10 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
Expand All @@ -247,6 +255,7 @@
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
SDKROOT = iphoneos;
Expand All @@ -260,12 +269,17 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
Expand Down
5 changes: 1 addition & 4 deletions samples/Simpletodo/SimpletodoFinal/Simpletodo.xcdatamodeld/.xccurrentversion
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>_XCCurrentVersionName</key>
<string>Simpletodo.xcdatamodel</string>
</dict>
<dict/>
</plist>

0 comments on commit 27fa486

Please sign in to comment.