diff --git a/SocketDatastreamExampleiOS/SocketDatastreamExampleiOS.xcodeproj/project.pbxproj b/SocketDatastreamExampleiOS/SocketDatastreamExampleiOS.xcodeproj/project.pbxproj index 6bbca78..830c628 100644 --- a/SocketDatastreamExampleiOS/SocketDatastreamExampleiOS.xcodeproj/project.pbxproj +++ b/SocketDatastreamExampleiOS/SocketDatastreamExampleiOS.xcodeproj/project.pbxproj @@ -17,7 +17,6 @@ 918D6BCC16DF9B5900909170 /* XivelyModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 918D6BBE16DF9B5900909170 /* XivelyModel.m */; }; 918D6BCD16DF9B5900909170 /* XivelyRequestable.m in Sources */ = {isa = PBXBuildFile; fileRef = 918D6BC116DF9B5900909170 /* XivelyRequestable.m */; }; 918D6BCE16DF9B5900909170 /* XivelySubscribable.m in Sources */ = {isa = PBXBuildFile; fileRef = 918D6BC316DF9B5900909170 /* XivelySubscribable.m */; }; - 918D6BCF16DF9B5900909170 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 918D6BC416DF9B5900909170 /* README.md */; }; 91A55BC416DCE72400D2F4F4 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91A55BC316DCE72400D2F4F4 /* UIKit.framework */; }; 91A55BC616DCE72400D2F4F4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91A55BC516DCE72400D2F4F4 /* Foundation.framework */; }; 91A55BC816DCE72400D2F4F4 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91A55BC716DCE72400D2F4F4 /* CoreGraphics.framework */; }; @@ -74,7 +73,6 @@ 918D6BC116DF9B5900909170 /* XivelyRequestable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = XivelyRequestable.m; path = ../XivelyObjectiveC/XivelyRequestable.m; sourceTree = ""; }; 918D6BC216DF9B5900909170 /* XivelySubscribable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XivelySubscribable.h; path = ../XivelyObjectiveC/XivelySubscribable.h; sourceTree = ""; }; 918D6BC316DF9B5900909170 /* XivelySubscribable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = XivelySubscribable.m; path = ../XivelyObjectiveC/XivelySubscribable.m; sourceTree = ""; }; - 918D6BC416DF9B5900909170 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = README.md; path = ../XivelyObjectiveC/README.md; sourceTree = ""; }; 91A55BBF16DCE72400D2F4F4 /* SocketDatastreamExampleiOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SocketDatastreamExampleiOS.app; sourceTree = BUILT_PRODUCTS_DIR; }; 91A55BC316DCE72400D2F4F4 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 91A55BC516DCE72400D2F4F4 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; @@ -124,7 +122,7 @@ 91A55C9F16DD5BBB00D2F4F4 /* Utils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = Utils.m; path = ../Shared/Utilites/Utils.m; sourceTree = ""; }; 91A55CA116DD612400D2F4F4 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Icon.png; path = ../Icon.png; sourceTree = ""; }; 91A55CA316DD612A00D2F4F4 /* Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon@2x.png"; path = "../Icon@2x.png"; sourceTree = ""; }; - 91D7530116E77547005D5DDA /* XivelyDatapointCollectionDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file; name = XivelyDatapointCollectionDelegate.h; path = ../XivelyObjectiveC/XivelyDatapointCollectionDelegate.h; sourceTree = ""; }; + 91D7530116E77547005D5DDA /* XivelyDatapointCollectionDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XivelyDatapointCollectionDelegate.h; path = ../XivelyObjectiveC/XivelyDatapointCollectionDelegate.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -171,7 +169,6 @@ 918D6BC116DF9B5900909170 /* XivelyRequestable.m */, 918D6BC216DF9B5900909170 /* XivelySubscribable.h */, 918D6BC316DF9B5900909170 /* XivelySubscribable.m */, - 918D6BC416DF9B5900909170 /* README.md */, ); name = XivelyObjectiveC; sourceTree = ""; @@ -349,7 +346,6 @@ 91A55BDD16DCE72400D2F4F4 /* MainStoryboard.storyboard in Resources */, 91A55CA216DD612400D2F4F4 /* Icon.png in Resources */, 91A55CA416DD612A00D2F4F4 /* Icon@2x.png in Resources */, - 918D6BCF16DF9B5900909170 /* README.md in Resources */, 91D7530216E77547005D5DDA /* XivelyDatapointCollectionDelegate.h in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -435,7 +431,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.1; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; }; @@ -456,7 +452,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.1; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; diff --git a/SocketDatastreamExampleiOS/SocketDatastreamExampleiOS/en.lproj/MainStoryboard.storyboard b/SocketDatastreamExampleiOS/SocketDatastreamExampleiOS/en.lproj/MainStoryboard.storyboard index eb89585..17ea855 100644 --- a/SocketDatastreamExampleiOS/SocketDatastreamExampleiOS/en.lproj/MainStoryboard.storyboard +++ b/SocketDatastreamExampleiOS/SocketDatastreamExampleiOS/en.lproj/MainStoryboard.storyboard @@ -1,184 +1,267 @@ - + - + + + + + + - + - - - + + - + + + + + + + + + + + + + + + + + + + + + + + - - - + + - + - - + + + + + + + + + + + + + + + + + + + + + - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -197,29 +280,9 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/SocketFeedExampleiOS/SocketFeedExampleiOS.xcodeproj/project.pbxproj b/SocketFeedExampleiOS/SocketFeedExampleiOS.xcodeproj/project.pbxproj index 92ed6cc..0f75070 100644 --- a/SocketFeedExampleiOS/SocketFeedExampleiOS.xcodeproj/project.pbxproj +++ b/SocketFeedExampleiOS/SocketFeedExampleiOS.xcodeproj/project.pbxproj @@ -18,7 +18,6 @@ 918D6BEF16DF9B6400909170 /* XivelyModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 918D6BE116DF9B6400909170 /* XivelyModel.m */; }; 918D6BF016DF9B6400909170 /* XivelyRequestable.m in Sources */ = {isa = PBXBuildFile; fileRef = 918D6BE416DF9B6400909170 /* XivelyRequestable.m */; }; 918D6BF116DF9B6400909170 /* XivelySubscribable.m in Sources */ = {isa = PBXBuildFile; fileRef = 918D6BE616DF9B6400909170 /* XivelySubscribable.m */; }; - 918D6BF216DF9B6400909170 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 918D6BE716DF9B6400909170 /* README.md */; }; 91A55BC416DCE72400D2F4F4 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91A55BC316DCE72400D2F4F4 /* UIKit.framework */; }; 91A55BC616DCE72400D2F4F4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91A55BC516DCE72400D2F4F4 /* Foundation.framework */; }; 91A55BC816DCE72400D2F4F4 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91A55BC716DCE72400D2F4F4 /* CoreGraphics.framework */; }; @@ -76,7 +75,6 @@ 918D6BE416DF9B6400909170 /* XivelyRequestable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = XivelyRequestable.m; path = ../XivelyObjectiveC/XivelyRequestable.m; sourceTree = ""; }; 918D6BE516DF9B6400909170 /* XivelySubscribable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XivelySubscribable.h; path = ../XivelyObjectiveC/XivelySubscribable.h; sourceTree = ""; }; 918D6BE616DF9B6400909170 /* XivelySubscribable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = XivelySubscribable.m; path = ../XivelyObjectiveC/XivelySubscribable.m; sourceTree = ""; }; - 918D6BE716DF9B6400909170 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = README.md; path = ../XivelyObjectiveC/README.md; sourceTree = ""; }; 91A55BBF16DCE72400D2F4F4 /* SocketFeedExampleiOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SocketFeedExampleiOS.app; sourceTree = BUILT_PRODUCTS_DIR; }; 91A55BC316DCE72400D2F4F4 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 91A55BC516DCE72400D2F4F4 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; @@ -125,7 +123,7 @@ 91BEBCB316DE03050004EF4E /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "SocketFeedExampleiOS/Default-568h@2x.png"; sourceTree = SOURCE_ROOT; }; 91BEBCB416DE03050004EF4E /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = SocketFeedExampleiOS/Default.png; sourceTree = SOURCE_ROOT; }; 91BEBCB516DE03050004EF4E /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "SocketFeedExampleiOS/Default@2x.png"; sourceTree = SOURCE_ROOT; }; - 91D7530416E77555005D5DDA /* XivelyDatapointCollectionDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file; name = XivelyDatapointCollectionDelegate.h; path = ../XivelyObjectiveC/XivelyDatapointCollectionDelegate.h; sourceTree = ""; }; + 91D7530416E77555005D5DDA /* XivelyDatapointCollectionDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XivelyDatapointCollectionDelegate.h; path = ../XivelyObjectiveC/XivelyDatapointCollectionDelegate.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -172,7 +170,6 @@ 918D6BE416DF9B6400909170 /* XivelyRequestable.m */, 918D6BE516DF9B6400909170 /* XivelySubscribable.h */, 918D6BE616DF9B6400909170 /* XivelySubscribable.m */, - 918D6BE716DF9B6400909170 /* README.md */, ); name = XivelyObjectiveC; sourceTree = ""; @@ -350,7 +347,6 @@ 91BEBCB716DE03050004EF4E /* Default.png in Resources */, 91BEBCB816DE03050004EF4E /* Default@2x.png in Resources */, 91BEBCBC16DE05A60004EF4E /* MainStoryboard.storyboard in Resources */, - 918D6BF216DF9B6400909170 /* README.md in Resources */, 91D7530516E77555005D5DDA /* XivelyDatapointCollectionDelegate.h in Resources */, ); runOnlyForDeploymentPostprocessing = 0; diff --git a/Tests/Tests.xcodeproj/project.pbxproj b/Tests/Tests.xcodeproj/project.pbxproj index 7896940..404058d 100644 --- a/Tests/Tests.xcodeproj/project.pbxproj +++ b/Tests/Tests.xcodeproj/project.pbxproj @@ -43,7 +43,7 @@ 91074F3916E4DE47008418BE /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 91074F3B16E4DE47008418BE /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 91074F3D16E4DE47008418BE /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; - 91074F5616E4DE47008418BE /* TestsTests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = TestsTests.octest; path = XivelyObjectiveCTests.octest; sourceTree = BUILT_PRODUCTS_DIR; }; + 91074F5616E4DE47008418BE /* XivelyObjectiveCTests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = XivelyObjectiveCTests.octest; sourceTree = BUILT_PRODUCTS_DIR; }; 91074F5716E4DE47008418BE /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; }; 91074F5F16E4DE47008418BE /* TestsTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "TestsTests-Info.plist"; sourceTree = ""; }; 91074F6116E4DE47008418BE /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; @@ -139,7 +139,7 @@ 91074F3616E4DE47008418BE /* Products */ = { isa = PBXGroup; children = ( - 91074F5616E4DE47008418BE /* TestsTests.octest */, + 91074F5616E4DE47008418BE /* XivelyObjectiveCTests.octest */, ); name = Products; sourceTree = ""; @@ -261,8 +261,8 @@ ); name = XivelyObjectiveCTests; productName = TestsTests; - productReference = 91074F5616E4DE47008418BE /* TestsTests.octest */; - productType = "com.apple.product-type.bundle"; + productReference = 91074F5616E4DE47008418BE /* XivelyObjectiveCTests.octest */; + productType = "com.apple.product-type.bundle.ocunit-test"; }; /* End PBXNativeTarget section */ diff --git a/XivelyObjectiveC/XivelyDatapointCollection.m b/XivelyObjectiveC/XivelyDatapointCollection.m index 9974807..70c9964 100644 --- a/XivelyObjectiveC/XivelyDatapointCollection.m +++ b/XivelyObjectiveC/XivelyDatapointCollection.m @@ -31,7 +31,7 @@ - (void)save { } return; } - NSURL *url = [self.api urlForRoute:[NSString stringWithFormat:@"feeds/%d/datastreams/%@/datapoints", self.feedId, self.datastreamId]]; + NSURL *url = [self.api urlForRoute:[NSString stringWithFormat:@"feeds/%lu/datastreams/%@/datapoints", (unsigned long)self.feedId, self.datastreamId]]; AFHTTPClient *httpClient = [AFHTTPClient clientWithBaseURL:url]; NSMutableURLRequest *request = [httpClient requestWithMethod:@"POST" path:nil parameters:nil]; [request setValue:@"application/json" forHTTPHeaderField:@"Accept"]; diff --git a/XivelyObjectiveC/XivelyDatapointModel.m b/XivelyObjectiveC/XivelyDatapointModel.m index da6a6a6..7767a84 100644 --- a/XivelyObjectiveC/XivelyDatapointModel.m +++ b/XivelyObjectiveC/XivelyDatapointModel.m @@ -26,7 +26,7 @@ - (void)save { } return; } - NSURL *url = [self.api urlForRoute:[NSString stringWithFormat:@"feeds/%d/datastreams/%@/datapoints", self.feedId, self.datastreamId]]; + NSURL *url = [self.api urlForRoute:[NSString stringWithFormat:@"feeds/%lu/datastreams/%@/datapoints", (unsigned long)self.feedId, self.datastreamId]]; AFHTTPClient *httpClient = [AFHTTPClient clientWithBaseURL:url]; NSMutableURLRequest *request = [httpClient requestWithMethod:@"POST" path:nil parameters:nil]; [request setValue:@"application/json" forHTTPHeaderField:@"Accept"]; @@ -85,7 +85,7 @@ - (void)fetch { } return; } - NSURL *url = [self.api urlForRoute:[NSString stringWithFormat:@"feeds/%d/datastreams/%@/datapoints/%@", self.feedId, self.datastreamId, [self.info objectForKey:@"at"]] withParameters:self.parameters]; + NSURL *url = [self.api urlForRoute:[NSString stringWithFormat:@"feeds/%lu/datastreams/%@/datapoints/%@", (unsigned long)self.feedId, self.datastreamId, [self.info objectForKey:@"at"]] withParameters:self.parameters]; NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:url cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:40.0]; [request setValue:self.api.versionString forHTTPHeaderField:@"User-Agent"]; AFJSONRequestOperation *operation = [AFJSONRequestOperation JSONRequestOperationWithRequest:request @@ -122,7 +122,7 @@ - (void)deleteFromXively { } return; } - NSURL *url = [self.api urlForRoute:[NSString stringWithFormat:@"feeds/%d/datastreams/%@/datapoints/%@", self.feedId, self.datastreamId, [self.info objectForKey:@"at"]]]; + NSURL *url = [self.api urlForRoute:[NSString stringWithFormat:@"feeds/%lu/datastreams/%@/datapoints/%@", (unsigned long)self.feedId, self.datastreamId, [self.info objectForKey:@"at"]]]; AFHTTPClient *httpClient = [AFHTTPClient clientWithBaseURL:url]; NSMutableURLRequest *request = [httpClient requestWithMethod:@"DELETE" path:nil parameters:nil]; [request setValue:@"application/json" forHTTPHeaderField:@"Accept"]; diff --git a/XivelyObjectiveC/XivelyDatastreamModel.m b/XivelyObjectiveC/XivelyDatastreamModel.m index 8a4b6d6..fa38099 100644 --- a/XivelyObjectiveC/XivelyDatastreamModel.m +++ b/XivelyObjectiveC/XivelyDatastreamModel.m @@ -24,7 +24,7 @@ - (BOOL)checkIdAndNotifyOnFailure { @synthesize isNew; - (NSString *)resourceURLString { - return [NSString stringWithFormat:@"feeds/%d/datastreams/%@", self.feedId, [self.info valueForKeyPath:@"id"]]; + return [NSString stringWithFormat:@"feeds/%lu/datastreams/%@", (unsigned long)self.feedId, [self.info valueForKeyPath:@"id"]]; } - (void)fetch { @@ -73,7 +73,7 @@ - (void)save { // POST // using the feed api as the datastream api is returning an error? - NSURL *url = [self.api urlForRoute:[NSString stringWithFormat:@"feeds/%d", self.feedId]]; + NSURL *url = [self.api urlForRoute:[NSString stringWithFormat:@"feeds/%lu", (unsigned long)self.feedId]]; AFHTTPClient *httpClient = [AFHTTPClient clientWithBaseURL:url]; NSMutableURLRequest *request = [httpClient requestWithMethod:@"PUT" path:nil parameters:nil]; [request setValue:@"application/json" forHTTPHeaderField:@"Accept"]; @@ -167,7 +167,7 @@ - (void)deleteFromXively { } return; } - NSURL *url = [self.api urlForRoute:[NSString stringWithFormat:@"feeds/%d/datastreams/%@", feedId, datastreamId]]; + NSURL *url = [self.api urlForRoute:[NSString stringWithFormat:@"feeds/%lu/datastreams/%@", (unsigned long)feedId, datastreamId]]; AFHTTPClient *httpClient = [AFHTTPClient clientWithBaseURL:url]; NSMutableURLRequest *request = [httpClient requestWithMethod:@"DELETE" path:nil parameters:nil]; [request setValue:self.api.versionString forHTTPHeaderField:@"User-Agent"];