Skip to content

Commit

Permalink
Carnival iOS SDK 3.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
CarnivalBot committed Sep 22, 2015
1 parent 23bee9e commit 350ab47
Show file tree
Hide file tree
Showing 27 changed files with 287 additions and 65 deletions.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Created by Carnival Mobile
// Copyright (c) 2015 Carnival Mobile. All rights reserved.
//
// For documentation see http://docs.carnivalmobile.com
// For documentation see http://docs.carnival.io
//

#import <Foundation/Foundation.h>
Expand All @@ -15,7 +15,7 @@
#import "CarnivalStreamViewController.h"
#import "CarnivalMacros.h"

#define CARNIVAL_VERSION @"3.5.2"
#define CARNIVAL_VERSION @"3.6.0"

__attribute__((deprecated))
@protocol CarnivalIdentifierDataSource <NSObject>
Expand Down Expand Up @@ -74,23 +74,25 @@ __attribute__((deprecated))
*/
+ (void)startEngine:(carnival_nonnull NSString *)appKey registerForPushNotifications:(BOOL)registerForPushNotifications;

/** @name Tags */
/** @name Tags
* @warning Tags are now deprecated in favour for setting an array of strings with setStrings:forKey: methods.
*/

/**
* Asyncronously sets the tags for Carnival for this Device.
*
* @param tags An array of tags for this device. A nil value or an empty NSArray will clear the tags for this Device.
* @discussion Calling this method will overwrite any previously set tags for this Device.
*/
+ (void)setTagsInBackground:(carnival_nonnull NSArray *)tags withResponse:(carnival_nullable void(^)(NSArray *__carnival_nullable tags, NSError *__carnival_nullable error))block;
+ (void)setTagsInBackground:(carnival_nonnull NSArray *)tags withResponse:(carnival_nullable void(^)(NSArray *__carnival_nullable tags, NSError *__carnival_nullable error))block __attribute__((deprecated("Use setStrings:forKey: instead.")));

/**
* Asyncronously sets the tags for Carnival for this Device, with no callback block.
*
* @param tags An array of tags for this device. A nil value or an empty NSArray will clear the tags for this Device.
* @discussion Calling this method will overwrite any previously set tags for this Device.
*/
+ (void)setTagsInBackground:(carnival_nonnull NSArray *)tags;
+ (void)setTagsInBackground:(carnival_nonnull NSArray *)tags __attribute__((deprecated("Use setStrings:forKey: instead.")));

/**
* Synchronously sets the tags for Carnival for this Device.
Expand All @@ -103,7 +105,7 @@ __attribute__((deprecated))
*
* @return NSArray of newly updated tags.
*/
+ (carnival_nullable NSArray *)setTags:(carnival_nonnull NSArray *)tags error:(NSError *__carnival_nullable *__carnival_nullable)error;
+ (carnival_nullable NSArray *)setTags:(carnival_nonnull NSArray *)tags error:(NSError *__carnival_nullable *__carnival_nullable)error __attribute__((deprecated("Use setStrings:forKey: instead.")));

/**
* Asyncronously adds the tags to Carnival for this Device. If the tags are already registered with Carnival, this method does not add the tag again.
Expand All @@ -114,7 +116,7 @@ __attribute__((deprecated))
*
* @warning This method behaves like getTagsInBackgroundWithResponse when tags argument is nil or not an NSArray.
*/
+ (void)addTags:(carnival_nonnull NSArray *)tags inBackgroundWithResponse:(carnival_nullable void(^)(NSArray *__carnival_nullable tags, NSError *__carnival_nullable error))block;
+ (void)addTags:(carnival_nonnull NSArray *)tags inBackgroundWithResponse:(carnival_nullable void(^)(NSArray *__carnival_nullable tags, NSError *__carnival_nullable error))block __attribute__((deprecated("Use setStrings:forKey: instead.")));

/**
* Syncronously adds the tags to Carnival for this Device. If the tags are already registered with Carnival, this method does not add the tag again.
Expand All @@ -127,7 +129,7 @@ __attribute__((deprecated))
*
* @return NSArray of newly updated tags.
*/
+ (carnival_nullable NSArray *)addTags:(carnival_nonnull NSArray *)tags error:(NSError *__carnival_nullable *__carnival_nullable)error;
+ (carnival_nullable NSArray *)addTags:(carnival_nonnull NSArray *)tags error:(NSError *__carnival_nullable *__carnival_nullable)error __attribute__((deprecated("Use setStrings:forKey: instead.")));

/**
* Asyncronously gets the tags for Carnival for this Device.
Expand All @@ -136,7 +138,7 @@ __attribute__((deprecated))
*
* @warning This method does nothing when the response block is NULL.
*/
+ (void)getTagsInBackgroundWithResponse:(carnival_nonnull void(^)(NSArray *__carnival_nullable tags, NSError *__carnival_nullable error))block;
+ (void)getTagsInBackgroundWithResponse:(carnival_nonnull void(^)(NSArray *__carnival_nullable tags, NSError *__carnival_nullable error))block __attribute__((deprecated));

/**
* Syncronously gets the tags for Carnival for this Device.
Expand All @@ -145,7 +147,7 @@ __attribute__((deprecated))
*
* @return NSArray of newly updated tags.
*/
+ (carnival_nullable NSArray *)getTags:(NSError *__carnival_nullable *__carnival_nullable)error;
+ (carnival_nullable NSArray *)getTags:(NSError *__carnival_nullable *__carnival_nullable)error __attribute__((deprecated));

/** @name Key/Value Attributes */

Expand All @@ -167,6 +169,24 @@ __attribute__((deprecated))
**/
+ (void)setString:(carnival_nonnull NSString *)string forKey:(carnival_nonnull NSString *)key error:(NSError *__carnival_nullable *__carnival_nullable)error;

/**
* Asyncronously sets an array of string for a given key.
*
* @param array The array of strings to be set.
* @param key The string value of the key.
* @param block The block returned from the asyncronous call possibly containing an error.
**/
+ (void)setStrings:(carnival_nonnull NSArray *)array forKey:(carnival_nonnull NSString *)key withResponse:(carnival_nullable void(^)(NSError *__carnival_nullable error))block;

/**
* Syncronously sets an array of string for a given key.
*
* @param array The array of strings to be set.
* @param key The string value of the key.
* @param error A pointer to an error which will be non-nil if there is an error.
**/
+ (void)setStrings:(carnival_nonnull NSArray *)array forKey:(carnival_nonnull NSString *)key error:(NSError *__carnival_nullable *__carnival_nullable)error;

/**
* Asyncronously sets a float value for a given key.
*
Expand All @@ -185,6 +205,24 @@ __attribute__((deprecated))
**/
+ (void)setFloat:(CGFloat)aFloat forKey:(carnival_nonnull NSString *)key error:(NSError *__carnival_nullable *__carnival_nullable)error;

/**
* Asyncronously sets an array of NSNumbers (which are backed by floats) for a given key.
*
* @param array The array of NSNumbers, backed by floats, to be set.
* @param key The string value of the key.
* @param block The block returned from the asyncronous call possibly containing an error.
**/
+ (void)setFloats:(carnival_nonnull NSArray *)array forKey:(carnival_nonnull NSString *)key withResponse:(carnival_nullable void(^)(NSError *__carnival_nullable error))block;

/**
* Syncronously sets an array of NSNumbers (which are backed by floats) for a given key.
*
* @param array The array of NSNumbers, backed by floats, to be set.
* @param key The string value of the key.
* @param error A pointer to an error which will be non-nil if there is an error.
**/
+ (void)setFloats:(carnival_nonnull NSArray *)array forKey:(carnival_nonnull NSString *)key error:(NSError *__carnival_nullable *__carnival_nullable)error;

/**
* Asyncronously sets an integer value for a given key.
*
Expand All @@ -203,6 +241,24 @@ __attribute__((deprecated))
**/
+ (void)setInteger:(NSInteger)integer forKey:(carnival_nonnull NSString *)key error:(NSError *__carnival_nullable *__carnival_nullable)error;

/**
* Asyncronously sets an array of NSNumbers (which are backed by integers) for a given key.
*
* @param array The array of NSNumbers, backed by integers, to be set.
* @param key The string value of the key.
* @param block The block returned from the asyncronous call possibly containing an error.
**/
+ (void)setIntegers:(carnival_nonnull NSArray *)array forKey:(carnival_nonnull NSString *)key withResponse:(carnival_nullable void(^)(NSError *__carnival_nullable error))block;

/**
* Syncronously sets an array of NSNumbers (which are backed by integers) for a given key.
*
* @param array The array of NSNumbers, backed by integers, to be set.
* @param key The string value of the key.
* @param error A pointer to an error which will be non-nil if there is an error.
**/
+ (void)setIntegers:(carnival_nonnull NSArray *)array forKey:(carnival_nonnull NSString *)key error:(NSError *__carnival_nullable *__carnival_nullable)error;

/**
* Asyncronously sets a date value for a given key.
*
Expand All @@ -221,6 +277,24 @@ __attribute__((deprecated))
**/
+ (void)setDate:(carnival_nonnull NSDate *)date forKey:(carnival_nonnull NSString *)key error:(NSError *__carnival_nullable *__carnival_nullable)error;

/**
* Asyncronously sets an array of date values for a given key.
*
* @param array The array of dates to be set.
* @param key The string value of the key.
* @param block The block returned from the asyncronous call possibly containing an error.
**/
+ (void)setDates:(carnival_nonnull NSArray *)array forKey:(carnival_nonnull NSString *)key withResponse:(carnival_nullable void(^)(NSError *__carnival_nullable error))block;

/**
* Syncronously sets an array of date values for a given key.
*
* @param array The array of dates to be set.
* @param key The string value of the key.
* @param error A pointer to an error which will be non-nil if there is an error.
**/
+ (void)setDates:(carnival_nonnull NSArray *)array forKey:(carnival_nonnull NSString *)key error:(NSError *__carnival_nullable *__carnival_nullable)error;

/**
* Asyncronously sets a boolean value for a given key.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Created by Carnival Mobile
// Copyright (c) 2015 Carnival Mobile. All rights reserved.
//
// For documentation see http://docs.carnivalmobile.com
// For documentation see http://docs.carnival.io
//

#import <Foundation/Foundation.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Created by Carnival Mobile
// Copyright (c) 2015 Carnival Mobile. All rights reserved.
//
// For documentation see http://docs.carnivalmobile.com
// For documentation see http://docs.carnival.io
//

#import <Foundation/Foundation.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Created by Carnival Mobile
// Copyright (c) 2015 Carnival Mobile. All rights reserved.
//
// For documentation see http://docs.carnivalmobile.com
// For documentation see http://docs.carnival.io
//

#import <UIKit/UIKit.h>
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
8 changes: 4 additions & 4 deletions Carnival.podspec
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Pod::Spec.new do |s|
s.name = 'Carnival'
s.version = '3.5.2'
s.summary = 'Carnival iOS SDK for integrating with http://carnivalmobile.com messaging and analytics service'
s.version = '3.6.0'
s.summary = 'Carnival iOS SDK for integrating with http://carnival.io messaging and analytics service'
s.author = {
'Carnival Mobile' => 'support@carnivalmobile.com'
'Carnival Mobile' => 'support@carnival.io'
}
s.homepage = 'http://docs.carnivalmobile.com'
s.homepage = 'http://docs.carnival.io'
s.source = {
:git => 'https://github.com/carnivalmobile/carnival-ios-sdk.git',
:tag => s.version.to_s
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 */
224C1B561B7BFC9900A0CF34 /* Carnival.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 224C1B531B7BFC9900A0CF34 /* Carnival.framework */; };
224C1B571B7BFC9900A0CF34 /* CarnivalResources.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 224C1B551B7BFC9900A0CF34 /* CarnivalResources.bundle */; };
22FDF4DD1BB2055D00FC4E26 /* Carnival.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22FDF4DA1BB2055D00FC4E26 /* Carnival.framework */; };
22FDF4DE1BB2055D00FC4E26 /* CarnivalResources.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 22FDF4DC1BB2055D00FC4E26 /* CarnivalResources.bundle */; };
7500812F1AF735C60096760A /* CloseBarButtonItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 7500812E1AF735C60096760A /* CloseBarButtonItem.m */; };
758D6AF419AE915600F09C8D /* (null) in Resources */ = {isa = PBXBuildFile; };
758D6AF619AE91E000F09C8D /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 758D6AF519AE91E000F09C8D /* AVFoundation.framework */; };
Expand All @@ -28,8 +28,8 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
224C1B531B7BFC9900A0CF34 /* Carnival.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Carnival.framework; sourceTree = "<group>"; };
224C1B551B7BFC9900A0CF34 /* CarnivalResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = CarnivalResources.bundle; sourceTree = "<group>"; };
22FDF4DA1BB2055D00FC4E26 /* Carnival.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Carnival.framework; sourceTree = "<group>"; };
22FDF4DC1BB2055D00FC4E26 /* CarnivalResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = CarnivalResources.bundle; sourceTree = "<group>"; };
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>"; };
7566D52919F9B984007D5D27 /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -65,27 +65,27 @@
758D6AF819AE91E800F09C8D /* MediaPlayer.framework in Frameworks */,
758D6AF619AE91E000F09C8D /* AVFoundation.framework in Frameworks */,
758E8D8D186367C900A8AFA4 /* UIKit.framework in Frameworks */,
224C1B561B7BFC9900A0CF34 /* Carnival.framework in Frameworks */,
22FDF4DD1BB2055D00FC4E26 /* Carnival.framework in Frameworks */,
758E8D89186367C900A8AFA4 /* Foundation.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
224C1B521B7BFC9900A0CF34 /* Carnival.embeddedframework */ = {
22FDF4D91BB2055D00FC4E26 /* Carnival.embeddedframework */ = {
isa = PBXGroup;
children = (
224C1B531B7BFC9900A0CF34 /* Carnival.framework */,
224C1B541B7BFC9900A0CF34 /* Resources */,
22FDF4DA1BB2055D00FC4E26 /* Carnival.framework */,
22FDF4DB1BB2055D00FC4E26 /* Resources */,
);
path = Carnival.embeddedframework;
sourceTree = "<group>";
};
224C1B541B7BFC9900A0CF34 /* Resources */ = {
22FDF4DB1BB2055D00FC4E26 /* Resources */ = {
isa = PBXGroup;
children = (
224C1B551B7BFC9900A0CF34 /* CarnivalResources.bundle */,
22FDF4DC1BB2055D00FC4E26 /* CarnivalResources.bundle */,
);
path = Resources;
sourceTree = "<group>";
Expand Down Expand Up @@ -125,7 +125,7 @@
758E8D8E186367C900A8AFA4 /* ExampleProject */ = {
isa = PBXGroup;
children = (
224C1B521B7BFC9900A0CF34 /* Carnival.embeddedframework */,
22FDF4D91BB2055D00FC4E26 /* Carnival.embeddedframework */,
7500812D1AF735C60096760A /* CloseBarButtonItem.h */,
7500812E1AF735C60096760A /* CloseBarButtonItem.m */,
758E8D97186367C900A8AFA4 /* ExampleAppDelegate.h */,
Expand Down Expand Up @@ -206,7 +206,7 @@
758E8D9F186367C900A8AFA4 /* Main_iPad.storyboard in Resources */,
758E8D9C186367C900A8AFA4 /* Main_iPhone.storyboard in Resources */,
758D6AF419AE915600F09C8D /* (null) in Resources */,
224C1B571B7BFC9900A0CF34 /* CarnivalResources.bundle in Resources */,
22FDF4DE1BB2055D00FC4E26 /* CarnivalResources.bundle in Resources */,
758E8DA4186367C900A8AFA4 /* Images.xcassets in Resources */,
758E8D93186367C900A8AFA4 /* InfoPlist.strings in Resources */,
);
Expand Down
Binary file not shown.
Loading

0 comments on commit 350ab47

Please sign in to comment.