Sprint 11 (#576)

* Carthage Support

* Initialize flush timer on the main thread.

* Replace Foundation import with UIKit import (#563)

* Track Campaign Data (#557)

* Update contributing docs (#564)

* Limit Queue size to 1000 (#565)

* Reformat (#566)

* Exclude files from backup (#567)

* Add tvOS Support (#572)

* reformat

* Track Deep Links (#573)

* Fix CI (#574)

* Use vanilla xcodebuild in CI

* use xcpretty in ci

* Update context object with referrer information (#575)

* use 3.2.6 in sample

.clang-format

@@ -0,0 +1 @@
+/Users/prateek/dev/src/github.com/square/spacecommander/.clang-format

.gitignore

@@ -29,3 +29,4 @@ Carthage
 # Additionally, we NEED to check it in for Carthage support.
 #
 # Pods/
+.clang-format

.travis.yml

@@ -1,12 +1,12 @@
 language: objective-c
 
-osx_image: xcode7
+osx_image: xcode7.3
 
 before_install:
   - make bootstrap
 
 script:
-  - make xcbuild xctest lint carthage
+  - make build-pretty test-pretty lint carthage
 
 before_deploy:
   - make archive

Analytics.podspec

@@ -15,6 +15,7 @@ Pod::Spec.new do |s|
   s.social_media_url = 'https://twitter.com/segment'
 
   s.ios.deployment_target = '7.0'
+  s.tvos.deployment_target = '9.0'
 
   s.source_files = 'Analytics/Classes/**/*'
 end

Analytics/Classes/Integrations/SEGAliasPayload.h

@@ -10,4 +10,4 @@
                       context:(NSDictionary *)context
                  integrations:(NSDictionary *)integrations;
 
-@end
+@end

Analytics/Classes/Integrations/SEGAliasPayload.m

@@ -13,4 +13,4 @@ - (instancetype)initWithNewId:(NSString *)newId
     return self;
 }
 
-@end
+@end

Analytics/Classes/Integrations/SEGGroupPayload.h

@@ -13,4 +13,4 @@
                         context:(NSDictionary *)context
                    integrations:(NSDictionary *)integrations;
 
-@end
+@end

Analytics/Classes/Integrations/SEGGroupPayload.m

@@ -15,4 +15,4 @@ - (instancetype)initWithGroupId:(NSString *)groupId
     return self;
 }
 
-@end
+@end

Analytics/Classes/Integrations/SEGIdentifyPayload.h

@@ -16,4 +16,4 @@
                        context:(NSDictionary *)context
                   integrations:(NSDictionary *)integrations;
 
-@end
+@end

Analytics/Classes/Integrations/SEGIdentifyPayload.m

@@ -17,4 +17,4 @@ - (instancetype)initWithUserId:(NSString *)userId
     return self;
 }
 
-@end
+@end

Analytics/Classes/Integrations/SEGIntegration.h

@@ -49,6 +49,8 @@
 // Flush is invoked when any queued events should be uploaded.
 - (void)flush;
 
+// App Delegate Callbacks
+
 // Callbacks for notifications changes.
 // ------------------------------------
 - (void)receivedRemoteNotification:(NSDictionary *)userInfo;
@@ -66,4 +68,7 @@
 - (void)applicationWillResignActive;
 - (void)applicationDidBecomeActive;
 
-@end
+- (void)continueUserActivity:(NSUserActivity *)activity;
+- (void)openURL:(NSURL *)url options:(NSDictionary *)options;
+
+@end

Analytics/Classes/Integrations/SEGIntegrationFactory.h

@@ -15,4 +15,4 @@
 /** The key for which this factory can create an Integration. */
 - (NSString *)key;
 
-@end
+@end

Analytics/Classes/Integrations/SEGPayload.h

@@ -8,4 +8,4 @@
 
 - (instancetype)initWithContext:(NSDictionary *)context integrations:(NSDictionary *)integrations;
 
-@end
+@end

Analytics/Classes/Integrations/SEGPayload.m

@@ -12,4 +12,4 @@ - (instancetype)initWithContext:(NSDictionary *)context integrations:(NSDictiona
     return self;
 }
 
-@end
+@end

Analytics/Classes/Integrations/SEGScreenPayload.h

@@ -15,4 +15,4 @@
                      context:(NSDictionary *)context
                 integrations:(NSDictionary *)integrations;
 
-@end
+@end

Analytics/Classes/Integrations/SEGScreenPayload.m

@@ -15,4 +15,4 @@ - (instancetype)initWithName:(NSString *)name
     return self;
 }
 
-@end
+@end

Analytics/Classes/Integrations/SEGTrackPayload.h

@@ -13,4 +13,4 @@
                       context:(NSDictionary *)context
                  integrations:(NSDictionary *)integrations;
 
-@end
+@end

Analytics/Classes/Integrations/SEGTrackPayload.m

@@ -16,4 +16,4 @@ - (instancetype)initWithEvent:(NSString *)event
     return self;
 }
 
-@end
+@end

Analytics/Classes/Internal/NSData+GZIP.h

@@ -38,4 +38,4 @@
 
 - (nullable NSData *)seg_gzippedData;
 
-@end
+@end

Analytics/Classes/Internal/NSData+GZIP.m

@@ -56,13 +56,13 @@ - (NSData *)seg_gzippedDataWithCompressionLevel:(float)level
     if (self.length == 0 || [self seg_isGzippedData]) {
         return self;
     }
-    
+
     void *libz = seg_libzOpen();
     int (*deflateInit2_)(z_streamp, int, int, int, int, int, const char *, int) =
-    (int (*)(z_streamp, int, int, int, int, int, const char *, int))dlsym(libz, "deflateInit2_");
+        (int (*)(z_streamp, int, int, int, int, int, const char *, int))dlsym(libz, "deflateInit2_");
     int (*deflate)(z_streamp, int) = (int (*)(z_streamp, int))dlsym(libz, "deflate");
     int (*deflateEnd)(z_streamp) = (int (*)(z_streamp))dlsym(libz, "deflateEnd");
-    
+
     z_stream stream;
     stream.zalloc = Z_NULL;
     stream.zfree = Z_NULL;
@@ -71,9 +71,9 @@ - (NSData *)seg_gzippedDataWithCompressionLevel:(float)level
     stream.next_in = (Bytef *)(void *)self.bytes;
     stream.total_out = 0;
     stream.avail_out = 0;
-    
+
     static const NSUInteger ChunkSize = 16384;
-    
+
     NSMutableData *output = nil;
     int compression = (level < 0.0f) ? Z_DEFAULT_COMPRESSION : (int)(roundf(level * 9));
     if (deflateInit2(&stream, compression, Z_DEFLATED, 31, 8, Z_DEFAULT_STRATEGY) == Z_OK) {
@@ -89,7 +89,7 @@ - (NSData *)seg_gzippedDataWithCompressionLevel:(float)level
         deflateEnd(&stream);
         output.length = stream.total_out;
     }
-    
+
     return output;
 }
 
@@ -104,4 +104,4 @@ - (BOOL)seg_isGzippedData
     return (self.length >= 2 && bytes[0] == 0x1f && bytes[1] == 0x8b);
 }
 
-@end
+@end

Analytics/Classes/Internal/SEGAnalyticsRequest.h

@@ -15,4 +15,4 @@ typedef void (^SEGAnalyticsRequestCompletionBlock)(void);
 + (instancetype)startWithURLRequest:(NSURLRequest *)urlRequest
                          completion:(SEGAnalyticsRequestCompletionBlock)completion;
 
-@end
+@end

Analytics/Classes/Internal/SEGAnalyticsRequest.m

@@ -31,9 +31,12 @@ - (id)initWithURLRequest:(NSURLRequest *)urlRequest
 
 - (void)start
 {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
     self.connection = [[NSURLConnection alloc] initWithRequest:self.urlRequest
                                                       delegate:self
                                               startImmediately:NO];
+#pragma clang diagnostic pop
     [self.connection setDelegateQueue:[[self class] networkQueue]];
     [self.connection start];
 }
@@ -114,4 +117,4 @@ - (NSIndexSet *)acceptableStatusCodes
     return _acceptableStatusCodes;
 }
 
-@end
+@end

Analytics/Classes/Internal/SEGAnalyticsUtils.h

@@ -26,4 +26,4 @@ NSDictionary *SEGCoerceDictionary(NSDictionary *dict);
 
 NSString *SEGIDFA(void);
 
-NSString *SEGEventNameForScreenTitle(NSString *title);
+NSString *SEGEventNameForScreenTitle(NSString *title);

Analytics/Classes/Internal/SEGAnalyticsUtils.m

@@ -6,7 +6,7 @@
 NSURL *SEGAnalyticsURLForFilename(NSString *filename)
 {
     NSArray *paths = NSSearchPathForDirectoriesInDomains(
-                                                         NSApplicationSupportDirectory, NSUserDomainMask, YES);
+        NSApplicationSupportDirectory, NSUserDomainMask, YES);
     NSString *supportPath = [paths firstObject];
     if (![[NSFileManager defaultManager] fileExistsAtPath:supportPath
                                               isDirectory:NULL]) {
@@ -85,7 +85,7 @@ void SEGLog(NSString *format, ...)
 {
     if (!kAnalyticsLoggerShowLogs)
         return;
-    
+
     va_list args;
     va_start(args, format);
     NSLogv(format, args);
@@ -103,14 +103,14 @@ static id SEGCoerceJSONObject(id obj)
         [obj isKindOfClass:[NSNull class]]) {
         return obj;
     }
-    
+
     if ([obj isKindOfClass:[NSArray class]]) {
         NSMutableArray *array = [NSMutableArray array];
         for (id i in obj)
             [array addObject:SEGCoerceJSONObject(i)];
         return array;
     }
-    
+
     if ([obj isKindOfClass:[NSDictionary class]]) {
         NSMutableDictionary *dict = [NSMutableDictionary dictionary];
         for (NSString *key in obj) {
@@ -122,13 +122,13 @@ static id SEGCoerceJSONObject(id obj)
         }
         return dict;
     }
-    
+
     if ([obj isKindOfClass:[NSDate class]])
         return iso8601FormattedString(obj);
-    
+
     if ([obj isKindOfClass:[NSURL class]])
         return [obj absoluteString];
-    
+
     // default to sending the object's description
     SEGLog(@"warning: dictionary values should be valid json types. got: %@. "
            @"coercing to: %@",
@@ -142,7 +142,7 @@ static void AssertDictionaryTypes(id dict)
     for (id key in dict) {
         assert([key isKindOfClass:[NSString class]]);
         id value = dict[key];
-        
+
         assert([value isKindOfClass:[NSString class]] ||
                [value isKindOfClass:[NSNumber class]] ||
                [value isKindOfClass:[NSNull class]] ||
@@ -170,15 +170,15 @@ static void AssertDictionaryTypes(id dict)
     if (identifierManager) {
         SEL sharedManagerSelector = NSSelectorFromString(@"sharedManager");
         id sharedManager =
-        ((id (*)(id, SEL))
-         [identifierManager methodForSelector:sharedManagerSelector])(
-                                                                      identifierManager, sharedManagerSelector);
+            ((id (*)(id, SEL))
+                 [identifierManager methodForSelector:sharedManagerSelector])(
+                identifierManager, sharedManagerSelector);
         SEL advertisingIdentifierSelector =
-        NSSelectorFromString(@"advertisingIdentifier");
+            NSSelectorFromString(@"advertisingIdentifier");
         NSUUID *uuid =
-        ((NSUUID * (*)(id, SEL))
-         [sharedManager methodForSelector:advertisingIdentifierSelector])(
-                                                                          sharedManager, advertisingIdentifierSelector);
+            ((NSUUID * (*)(id, SEL))
+                 [sharedManager methodForSelector:advertisingIdentifierSelector])(
+                sharedManager, advertisingIdentifierSelector);
         idForAdvertiser = [uuid UUIDString];
     }
     return idForAdvertiser;
@@ -187,4 +187,4 @@ static void AssertDictionaryTypes(id dict)
 NSString *SEGEventNameForScreenTitle(NSString *title)
 {
     return [[NSString alloc] initWithFormat:@"Viewed %@ Screen", title];
-}
+}

Analytics/Classes/Internal/SEGBluetooth.h

@@ -6,4 +6,4 @@
 - (BOOL)hasKnownState;
 - (BOOL)isEnabled;
 
-@end
+@end

Analytics/Classes/Internal/SEGBluetooth.m

@@ -36,4 +36,4 @@ - (BOOL)isEnabled
 }
 
 - (void)centralManagerDidUpdateState:(id)central {}
-@end
+@end

Analytics/Classes/Internal/SEGLocation.h

@@ -15,6 +15,9 @@
 @property (nonatomic, copy, readonly) NSDictionary *addressDictionary;
 @property (nonatomic, assign, readonly) BOOL hasKnownLocation;
 
+
+#if TARGET_OS_IOS || (TARGET_OS_MAC && !TARGET_OS_IPHONE)
 - (void)startUpdatingLocation;
+#endif
 
-@end
+@end