Skip to content

Commit

Permalink
Carnival iOS SDK 3.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
CarnivalBot committed Mar 14, 2016
1 parent d8a396d commit f84d9f4
Show file tree
Hide file tree
Showing 21 changed files with 58 additions and 40 deletions.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#import "CarnivalMessageStream.h"
#import "CarnivalStreamViewController.h"

#define CARNIVAL_VERSION @"3.9.0"
#define CARNIVAL_VERSION @"3.10.0"

/* Constants for Auto-Analytics Tracking */
NS_ASSUME_NONNULL_BEGIN
Expand Down Expand Up @@ -278,7 +278,7 @@ __attribute__((deprecated))
+ (void)setFloats:(nonnull NSArray<NSNumber *> *)array forKey:(nonnull NSString *)key error:(NSError *__nullable *__nullable)error;

/**
* Asyncronously sets an integer value for a given key.
* Asyncronously sets an integer value for a given key. Only 32-bit Integers are supported.
*
* @param integer The integer value to be set.
* @param key The string value of the key.
Expand All @@ -287,7 +287,7 @@ __attribute__((deprecated))
+ (void)setInteger:(NSInteger)integer forKey:(nonnull NSString *)key withResponse:(nullable void(^)(NSError *__nullable error))block;

/**
* Syncronously sets an integer value for a given key.
* Syncronously sets an integer value for a given key. Only 32-bit Integers are supported.
*
* @param integer The integer value to be set.
* @param key The string value of the key.
Expand All @@ -296,7 +296,7 @@ __attribute__((deprecated))
+ (void)setInteger:(NSInteger)integer forKey:(nonnull NSString *)key error:(NSError *__nullable *__nullable)error;

/**
* Asyncronously sets an array of NSNumbers (which are backed by integers) for a given key.
* Asyncronously sets an array of NSNumbers (which are backed by integers) for a given key. Only 32-bit Integers are supported.
*
* @param array The array of NSNumbers, backed by integers, to be set.
* @param key The string value of the key.
Expand All @@ -305,7 +305,7 @@ __attribute__((deprecated))
+ (void)setIntegers:(nonnull NSArray<NSNumber *> *)array forKey:(nonnull NSString *)key withResponse:(nullable void(^)(NSError *__nullable error))block;

/**
* Syncronously sets an array of NSNumbers (which are backed by integers) for a given key.
* Syncronously sets an array of NSNumbers (which are backed by integers) for a given key. Only 32-bit Integers are supported.
*
* @param array The array of NSNumbers, backed by integers, to be set.
* @param key The string value of the key.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,10 @@ typedef NS_ENUM(NSInteger, CarnivalMessageType) {
*/
@property (nonatomic, assign, readonly, getter=isRead) BOOL read;


/**
* A dictionary of arbitary attributes set on the message.
*/
@property (nonatomic, strong, nullable) NSDictionary *attributes;

@end
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion Carnival.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'Carnival'
s.version = '3.9.0'
s.version = '3.10.0'
s.summary = 'Carnival iOS SDK for integrating with http://carnival.io messaging and analytics service'
s.author = {
'Carnival Mobile' => '[email protected]'
Expand Down
24 changes: 12 additions & 12 deletions ExampleProject/ExampleProject.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
objects = {

/* Begin PBXBuildFile section */
22B325EA1C61511200A7056D /* Carnival.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22B325E71C61511200A7056D /* Carnival.framework */; };
22B325EB1C61511200A7056D /* CarnivalResources.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 22B325E91C61511200A7056D /* CarnivalResources.bundle */; };
2250C09A1C961FE70058AF79 /* Carnival.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2250C0971C961FE70058AF79 /* Carnival.framework */; };
2250C09B1C961FE70058AF79 /* CarnivalResources.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 2250C0991C961FE70058AF79 /* CarnivalResources.bundle */; };
22B325F41C6153A700A7056D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22B325F31C6153A700A7056D /* Security.framework */; };
7500812F1AF735C60096760A /* CloseBarButtonItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 7500812E1AF735C60096760A /* CloseBarButtonItem.m */; };
758D6AF419AE915600F09C8D /* (null) in Resources */ = {isa = PBXBuildFile; };
Expand All @@ -29,8 +29,8 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
22B325E71C61511200A7056D /* Carnival.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Carnival.framework; sourceTree = "<group>"; };
22B325E91C61511200A7056D /* CarnivalResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = CarnivalResources.bundle; sourceTree = "<group>"; };
2250C0971C961FE70058AF79 /* Carnival.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Carnival.framework; sourceTree = "<group>"; };
2250C0991C961FE70058AF79 /* CarnivalResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = CarnivalResources.bundle; sourceTree = "<group>"; };
22B325F31C6153A700A7056D /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
7500812D1AF735C60096760A /* CloseBarButtonItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CloseBarButtonItem.h; sourceTree = "<group>"; };
7500812E1AF735C60096760A /* CloseBarButtonItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CloseBarButtonItem.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -67,28 +67,28 @@
75D77B2D19F0778300BD2319 /* CoreGraphics.framework in Frameworks */,
758D6AF819AE91E800F09C8D /* MediaPlayer.framework in Frameworks */,
758D6AF619AE91E000F09C8D /* AVFoundation.framework in Frameworks */,
2250C09A1C961FE70058AF79 /* Carnival.framework in Frameworks */,
758E8D8D186367C900A8AFA4 /* UIKit.framework in Frameworks */,
22B325EA1C61511200A7056D /* Carnival.framework in Frameworks */,
758E8D89186367C900A8AFA4 /* Foundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
22B325E61C61511200A7056D /* Carnival.embeddedframework */ = {
2250C0961C961FE70058AF79 /* Carnival.embeddedframework */ = {
isa = PBXGroup;
children = (
22B325E71C61511200A7056D /* Carnival.framework */,
22B325E81C61511200A7056D /* Resources */,
2250C0971C961FE70058AF79 /* Carnival.framework */,
2250C0981C961FE70058AF79 /* Resources */,
);
path = Carnival.embeddedframework;
sourceTree = "<group>";
};
22B325E81C61511200A7056D /* Resources */ = {
2250C0981C961FE70058AF79 /* Resources */ = {
isa = PBXGroup;
children = (
22B325E91C61511200A7056D /* CarnivalResources.bundle */,
2250C0991C961FE70058AF79 /* CarnivalResources.bundle */,
);
path = Resources;
sourceTree = "<group>";
Expand Down Expand Up @@ -129,7 +129,7 @@
758E8D8E186367C900A8AFA4 /* ExampleProject */ = {
isa = PBXGroup;
children = (
22B325E61C61511200A7056D /* Carnival.embeddedframework */,
2250C0961C961FE70058AF79 /* Carnival.embeddedframework */,
7500812D1AF735C60096760A /* CloseBarButtonItem.h */,
7500812E1AF735C60096760A /* CloseBarButtonItem.m */,
758E8D97186367C900A8AFA4 /* ExampleAppDelegate.h */,
Expand Down Expand Up @@ -210,7 +210,7 @@
758E8D9F186367C900A8AFA4 /* Main_iPad.storyboard in Resources */,
758E8D9C186367C900A8AFA4 /* Main_iPhone.storyboard in Resources */,
758D6AF419AE915600F09C8D /* (null) in Resources */,
22B325EB1C61511200A7056D /* CarnivalResources.bundle in Resources */,
2250C09B1C961FE70058AF79 /* CarnivalResources.bundle in Resources */,
758E8DA4186367C900A8AFA4 /* Images.xcassets in Resources */,
758E8D93186367C900A8AFA4 /* InfoPlist.strings in Resources */,
);
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#import "CarnivalMessageStream.h"
#import "CarnivalStreamViewController.h"

#define CARNIVAL_VERSION @"3.9.0"
#define CARNIVAL_VERSION @"3.10.0"

/* Constants for Auto-Analytics Tracking */
NS_ASSUME_NONNULL_BEGIN
Expand Down Expand Up @@ -278,7 +278,7 @@ __attribute__((deprecated))
+ (void)setFloats:(nonnull NSArray<NSNumber *> *)array forKey:(nonnull NSString *)key error:(NSError *__nullable *__nullable)error;

/**
* Asyncronously sets an integer value for a given key.
* Asyncronously sets an integer value for a given key. Only 32-bit Integers are supported.
*
* @param integer The integer value to be set.
* @param key The string value of the key.
Expand All @@ -287,7 +287,7 @@ __attribute__((deprecated))
+ (void)setInteger:(NSInteger)integer forKey:(nonnull NSString *)key withResponse:(nullable void(^)(NSError *__nullable error))block;

/**
* Syncronously sets an integer value for a given key.
* Syncronously sets an integer value for a given key. Only 32-bit Integers are supported.
*
* @param integer The integer value to be set.
* @param key The string value of the key.
Expand All @@ -296,7 +296,7 @@ __attribute__((deprecated))
+ (void)setInteger:(NSInteger)integer forKey:(nonnull NSString *)key error:(NSError *__nullable *__nullable)error;

/**
* Asyncronously sets an array of NSNumbers (which are backed by integers) for a given key.
* Asyncronously sets an array of NSNumbers (which are backed by integers) for a given key. Only 32-bit Integers are supported.
*
* @param array The array of NSNumbers, backed by integers, to be set.
* @param key The string value of the key.
Expand All @@ -305,7 +305,7 @@ __attribute__((deprecated))
+ (void)setIntegers:(nonnull NSArray<NSNumber *> *)array forKey:(nonnull NSString *)key withResponse:(nullable void(^)(NSError *__nullable error))block;

/**
* Syncronously sets an array of NSNumbers (which are backed by integers) for a given key.
* Syncronously sets an array of NSNumbers (which are backed by integers) for a given key. Only 32-bit Integers are supported.
*
* @param array The array of NSNumbers, backed by integers, to be set.
* @param key The string value of the key.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,10 @@ typedef NS_ENUM(NSInteger, CarnivalMessageType) {
*/
@property (nonatomic, assign, readonly, getter=isRead) BOOL read;


/**
* A dictionary of arbitary attributes set on the message.
*/
@property (nonatomic, strong, nullable) NSDictionary *attributes;

@end
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion ExampleProject/ExampleProject/ExampleAppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(

#error Insert your app key that you got from http://app.carnivalmobile.com here, then remove this line

[Carnival startEngine:<#app key#>];
[Carnival startEngine:app key];

return YES;
}
Expand Down
22 changes: 11 additions & 11 deletions SwiftExampleProject/SwiftExampleProject.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
objects = {

/* Begin PBXBuildFile section */
22B325EF1C61513200A7056D /* Carnival.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22B325EC1C61513200A7056D /* Carnival.framework */; };
22B325F01C61513200A7056D /* CarnivalResources.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 22B325EE1C61513200A7056D /* CarnivalResources.bundle */; };
2250C09F1C9620060058AF79 /* Carnival.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2250C09C1C9620060058AF79 /* Carnival.framework */; };
2250C0A01C9620060058AF79 /* CarnivalResources.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 2250C09E1C9620060058AF79 /* CarnivalResources.bundle */; };
753541C119C0462D00B7F2BD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 753541C019C0462D00B7F2BD /* AppDelegate.swift */; };
753541C319C0462D00B7F2BD /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 753541C219C0462D00B7F2BD /* ViewController.swift */; };
753541C619C0462D00B7F2BD /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 753541C419C0462D00B7F2BD /* Main.storyboard */; };
Expand All @@ -22,8 +22,8 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
22B325EC1C61513200A7056D /* Carnival.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Carnival.framework; sourceTree = "<group>"; };
22B325EE1C61513200A7056D /* CarnivalResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = CarnivalResources.bundle; sourceTree = "<group>"; };
2250C09C1C9620060058AF79 /* Carnival.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Carnival.framework; sourceTree = "<group>"; };
2250C09E1C9620060058AF79 /* CarnivalResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = CarnivalResources.bundle; sourceTree = "<group>"; };
22B325F11C61524C00A7056D /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
753541BB19C0462D00B7F2BD /* SwiftExampleProject.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SwiftExampleProject.app; sourceTree = BUILT_PRODUCTS_DIR; };
753541BF19C0462D00B7F2BD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand All @@ -47,7 +47,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
22B325EF1C61513200A7056D /* Carnival.framework in Frameworks */,
2250C09F1C9620060058AF79 /* Carnival.framework in Frameworks */,
75DAC1FE19C061C6007F4332 /* libz.dylib in Frameworks */,
75DAC20319C0626F007F4332 /* CoreGraphics.framework in Frameworks */,
75DAC20419C0626F007F4332 /* CoreLocation.framework in Frameworks */,
Expand All @@ -59,18 +59,17 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
22B325ED1C61513200A7056D /* Resources */ = {
2250C09D1C9620060058AF79 /* Resources */ = {
isa = PBXGroup;
children = (
22B325EE1C61513200A7056D /* CarnivalResources.bundle */,
2250C09E1C9620060058AF79 /* CarnivalResources.bundle */,
);
path = Resources;
sourceTree = "<group>";
};
753541B219C0462D00B7F2BD = {
isa = PBXGroup;
children = (
22B325F11C61524C00A7056D /* Security.framework */,
753541BD19C0462D00B7F2BD /* SwiftExampleProject */,
753541D319C0462D00B7F2BD /* SwiftExampleProjectTests */,
753541BC19C0462D00B7F2BD /* Products */,
Expand Down Expand Up @@ -128,6 +127,7 @@
7535425D19C04BC000B7F2BD /* Frameworks */ = {
isa = PBXGroup;
children = (
22B325F11C61524C00A7056D /* Security.framework */,
75DAC1FD19C061C6007F4332 /* libz.dylib */,
75DAC20119C06256007F4332 /* CoreGraphics.framework */,
75DAC1FF19C0624F007F4332 /* CoreLocation.framework */,
Expand All @@ -148,8 +148,8 @@
7535426B19C05B4B00B7F2BD /* Carnival */ = {
isa = PBXGroup;
children = (
22B325EC1C61513200A7056D /* Carnival.framework */,
22B325ED1C61513200A7056D /* Resources */,
2250C09C1C9620060058AF79 /* Carnival.framework */,
2250C09D1C9620060058AF79 /* Resources */,
7535426C19C05B4B00B7F2BD /* Carnival-Bridging-Header.h */,
);
path = Carnival;
Expand Down Expand Up @@ -213,7 +213,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
22B325F01C61513200A7056D /* CarnivalResources.bundle in Resources */,
2250C0A01C9620060058AF79 /* CarnivalResources.bundle in Resources */,
753541C619C0462D00B7F2BD /* Main.storyboard in Resources */,
753541C819C0462D00B7F2BD /* Images.xcassets in Resources */,
);
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#import "CarnivalMessageStream.h"
#import "CarnivalStreamViewController.h"

#define CARNIVAL_VERSION @"3.9.0"
#define CARNIVAL_VERSION @"3.10.0"

/* Constants for Auto-Analytics Tracking */
NS_ASSUME_NONNULL_BEGIN
Expand Down Expand Up @@ -278,7 +278,7 @@ __attribute__((deprecated))
+ (void)setFloats:(nonnull NSArray<NSNumber *> *)array forKey:(nonnull NSString *)key error:(NSError *__nullable *__nullable)error;

/**
* Asyncronously sets an integer value for a given key.
* Asyncronously sets an integer value for a given key. Only 32-bit Integers are supported.
*
* @param integer The integer value to be set.
* @param key The string value of the key.
Expand All @@ -287,7 +287,7 @@ __attribute__((deprecated))
+ (void)setInteger:(NSInteger)integer forKey:(nonnull NSString *)key withResponse:(nullable void(^)(NSError *__nullable error))block;

/**
* Syncronously sets an integer value for a given key.
* Syncronously sets an integer value for a given key. Only 32-bit Integers are supported.
*
* @param integer The integer value to be set.
* @param key The string value of the key.
Expand All @@ -296,7 +296,7 @@ __attribute__((deprecated))
+ (void)setInteger:(NSInteger)integer forKey:(nonnull NSString *)key error:(NSError *__nullable *__nullable)error;

/**
* Asyncronously sets an array of NSNumbers (which are backed by integers) for a given key.
* Asyncronously sets an array of NSNumbers (which are backed by integers) for a given key. Only 32-bit Integers are supported.
*
* @param array The array of NSNumbers, backed by integers, to be set.
* @param key The string value of the key.
Expand All @@ -305,7 +305,7 @@ __attribute__((deprecated))
+ (void)setIntegers:(nonnull NSArray<NSNumber *> *)array forKey:(nonnull NSString *)key withResponse:(nullable void(^)(NSError *__nullable error))block;

/**
* Syncronously sets an array of NSNumbers (which are backed by integers) for a given key.
* Syncronously sets an array of NSNumbers (which are backed by integers) for a given key. Only 32-bit Integers are supported.
*
* @param array The array of NSNumbers, backed by integers, to be set.
* @param key The string value of the key.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,10 @@ typedef NS_ENUM(NSInteger, CarnivalMessageType) {
*/
@property (nonatomic, assign, readonly, getter=isRead) BOOL read;


/**
* A dictionary of arbitary attributes set on the message.
*/
@property (nonatomic, strong, nullable) NSDictionary *attributes;

@end
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit f84d9f4

Please sign in to comment.