diff --git a/Carnival.framework/Carnival b/Carnival.framework/Carnival index e770f06..ae49af2 100755 Binary files a/Carnival.framework/Carnival and b/Carnival.framework/Carnival differ diff --git a/Carnival.framework/Headers/Carnival.h b/Carnival.framework/Headers/Carnival.h index 4ac9a7a..6a0688c 100644 --- a/Carnival.framework/Headers/Carnival.h +++ b/Carnival.framework/Headers/Carnival.h @@ -15,7 +15,7 @@ #import "CarnivalAttributes.h" #import "CarnivalLogger.h" -#define CARNIVAL_VERSION @"6.1.4" +#define CARNIVAL_VERSION @"7.0.0" FOUNDATION_EXPORT double CarnivalSDKVersionNumber; FOUNDATION_EXPORT const unsigned char CarnivalSDKVersionString[]; @@ -52,20 +52,6 @@ NS_ASSUME_NONNULL_END */ + (void)startEngine:(nonnull NSString *)appKey; -/** - * Sets the Carnival appKey credentials for this app, and the UIUserNotificationType at the same time. - * - * @param appKey The appKey you recieved when setting up your app at http://app.carnivalmobile.com . - * @param types The UIUserNotificationType attributes you wish to register this app for as defined in UIApplication.h - * see appledocs for more information. If targeting, iOS 7 users, please use UIUserNotificationType anyway. - * @discussion An exception will be raised if you do not set your appKey before you call any other methods. - * Make sure your app bundle identifier is the same as whatever it is on http://app.carnivalmobile.com . - * - * @warning It is important that this method is called at the earliest possible opportunity (e.g. application:didFinishLaunchingWithOptions:), - * calling it later in the app lifecycle can have unintended consequences. No startEngine: calls (overrides included) must not be called more than once. - */ -+ (void)startEngine:(nonnull NSString *)appKey andNotificationTypes:(UIUserNotificationType)types; - /** * Sets the Carnival appKey credentials for this app and optionally registers for push notifications with the badge, alert and sound UIUserNotificationType's * diff --git a/Carnival.framework/Info.plist b/Carnival.framework/Info.plist index 310993c..a51225c 100644 Binary files a/Carnival.framework/Info.plist and b/Carnival.framework/Info.plist differ diff --git a/Carnival.podspec b/Carnival.podspec index 4ce167b..fdb3a6e 100644 --- a/Carnival.podspec +++ b/Carnival.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Carnival' - s.version = '6.1.4' + s.version = '7.0.0' s.summary = 'Carnival iOS SDK for integrating with http://carnival.io messaging and analytics service.' s.author = { 'Carnival Mobile' => 'support@sailthru.com' diff --git a/ExampleProject/ExampleProject.xcodeproj/project.pbxproj b/ExampleProject/ExampleProject.xcodeproj/project.pbxproj index c77f6e9..9507f3d 100644 --- a/ExampleProject/ExampleProject.xcodeproj/project.pbxproj +++ b/ExampleProject/ExampleProject.xcodeproj/project.pbxproj @@ -7,9 +7,9 @@ objects = { /* Begin PBXBuildFile section */ - 2251B1171F3D2631004CEE85 /* Carnival.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2251B1161F3D2630004CEE85 /* Carnival.framework */; }; - 2251B1181F3D2631004CEE85 /* Carnival.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 2251B1161F3D2630004CEE85 /* Carnival.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 22B325F41C6153A700A7056D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22B325F31C6153A700A7056D /* Security.framework */; }; + 22BF4BC61F94370A00B861FC /* Carnival.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22BF4BC41F94370200B861FC /* Carnival.framework */; }; + 22BF4BC71F94370A00B861FC /* Carnival.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 22BF4BC41F94370200B861FC /* Carnival.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 758D6AF419AE915600F09C8D /* (null) in Resources */ = {isa = PBXBuildFile; }; 758D6AF619AE91E000F09C8D /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 758D6AF519AE91E000F09C8D /* AVFoundation.framework */; }; 758D6AF819AE91E800F09C8D /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 758D6AF719AE91E800F09C8D /* MediaPlayer.framework */; }; @@ -34,7 +34,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 2251B1181F3D2631004CEE85 /* Carnival.framework in Embed Frameworks */, + 22BF4BC71F94370A00B861FC /* Carnival.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -42,8 +42,8 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 2251B1161F3D2630004CEE85 /* Carnival.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Carnival.framework; sourceTree = ""; }; 22B325F31C6153A700A7056D /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; + 22BF4BC41F94370200B861FC /* Carnival.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Carnival.framework; sourceTree = ""; }; 7566D52919F9B984007D5D27 /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; }; 758D6AF519AE91E000F09C8D /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; 758D6AF719AE91E800F09C8D /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = System/Library/Frameworks/MediaPlayer.framework; sourceTree = SDKROOT; }; @@ -77,7 +77,7 @@ 75D77B2D19F0778300BD2319 /* CoreGraphics.framework in Frameworks */, 758D6AF819AE91E800F09C8D /* MediaPlayer.framework in Frameworks */, 758D6AF619AE91E000F09C8D /* AVFoundation.framework in Frameworks */, - 2251B1171F3D2631004CEE85 /* Carnival.framework in Frameworks */, + 22BF4BC61F94370A00B861FC /* Carnival.framework in Frameworks */, 758E8D8D186367C900A8AFA4 /* UIKit.framework in Frameworks */, 758E8D89186367C900A8AFA4 /* Foundation.framework in Frameworks */, ); @@ -122,7 +122,7 @@ 758E8D8E186367C900A8AFA4 /* ExampleProject */ = { isa = PBXGroup; children = ( - 2251B1161F3D2630004CEE85 /* Carnival.framework */, + 22BF4BC41F94370200B861FC /* Carnival.framework */, 758E8D97186367C900A8AFA4 /* ExampleAppDelegate.h */, 758E8D98186367C900A8AFA4 /* ExampleAppDelegate.m */, 758E8DA0186367C900A8AFA4 /* ExampleViewController.h */, diff --git a/ExampleProject/ExampleProject/Carnival.framework/Carnival b/ExampleProject/ExampleProject/Carnival.framework/Carnival index 4460598..5148f08 100755 Binary files a/ExampleProject/ExampleProject/Carnival.framework/Carnival and b/ExampleProject/ExampleProject/Carnival.framework/Carnival differ diff --git a/ExampleProject/ExampleProject/Carnival.framework/Headers/Carnival.h b/ExampleProject/ExampleProject/Carnival.framework/Headers/Carnival.h index 4ac9a7a..6a0688c 100644 --- a/ExampleProject/ExampleProject/Carnival.framework/Headers/Carnival.h +++ b/ExampleProject/ExampleProject/Carnival.framework/Headers/Carnival.h @@ -15,7 +15,7 @@ #import "CarnivalAttributes.h" #import "CarnivalLogger.h" -#define CARNIVAL_VERSION @"6.1.4" +#define CARNIVAL_VERSION @"7.0.0" FOUNDATION_EXPORT double CarnivalSDKVersionNumber; FOUNDATION_EXPORT const unsigned char CarnivalSDKVersionString[]; @@ -52,20 +52,6 @@ NS_ASSUME_NONNULL_END */ + (void)startEngine:(nonnull NSString *)appKey; -/** - * Sets the Carnival appKey credentials for this app, and the UIUserNotificationType at the same time. - * - * @param appKey The appKey you recieved when setting up your app at http://app.carnivalmobile.com . - * @param types The UIUserNotificationType attributes you wish to register this app for as defined in UIApplication.h - * see appledocs for more information. If targeting, iOS 7 users, please use UIUserNotificationType anyway. - * @discussion An exception will be raised if you do not set your appKey before you call any other methods. - * Make sure your app bundle identifier is the same as whatever it is on http://app.carnivalmobile.com . - * - * @warning It is important that this method is called at the earliest possible opportunity (e.g. application:didFinishLaunchingWithOptions:), - * calling it later in the app lifecycle can have unintended consequences. No startEngine: calls (overrides included) must not be called more than once. - */ -+ (void)startEngine:(nonnull NSString *)appKey andNotificationTypes:(UIUserNotificationType)types; - /** * Sets the Carnival appKey credentials for this app and optionally registers for push notifications with the badge, alert and sound UIUserNotificationType's * diff --git a/ExampleProject/ExampleProject/Carnival.framework/Info.plist b/ExampleProject/ExampleProject/Carnival.framework/Info.plist index c832369..4bdddbe 100644 Binary files a/ExampleProject/ExampleProject/Carnival.framework/Info.plist and b/ExampleProject/ExampleProject/Carnival.framework/Info.plist differ diff --git a/SwiftExampleProject/SwiftExampleProject.xcodeproj/project.pbxproj b/SwiftExampleProject/SwiftExampleProject.xcodeproj/project.pbxproj index ce5e1b0..b5292a2 100644 --- a/SwiftExampleProject/SwiftExampleProject.xcodeproj/project.pbxproj +++ b/SwiftExampleProject/SwiftExampleProject.xcodeproj/project.pbxproj @@ -7,8 +7,8 @@ objects = { /* Begin PBXBuildFile section */ - 228F2AC11F3D264E00DD4F43 /* Carnival.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2251B10E1F3D249A004CEE85 /* Carnival.framework */; }; - 228F2AC21F3D264E00DD4F43 /* Carnival.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 2251B10E1F3D249A004CEE85 /* Carnival.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 22BF4BC11F94353000B861FC /* Carnival.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22BF4BC01F94353000B861FC /* Carnival.framework */; }; + 22BF4BC31F94353400B861FC /* Carnival.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 22BF4BC01F94353000B861FC /* Carnival.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 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 */; }; @@ -27,7 +27,7 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 228F2AC21F3D264E00DD4F43 /* Carnival.framework in Embed Frameworks */, + 22BF4BC31F94353400B861FC /* Carnival.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -36,8 +36,8 @@ /* Begin PBXFileReference section */ 2251B10D1F3D2491004CEE85 /* Carnival.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Carnival.framework; sourceTree = ""; }; - 2251B10E1F3D249A004CEE85 /* Carnival.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carnival.framework; path = SwiftExampleProject/Carnival.framework; sourceTree = SOURCE_ROOT; }; 22B325F11C61524C00A7056D /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; + 22BF4BC01F94353000B861FC /* Carnival.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Carnival.framework; sourceTree = ""; }; 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 = ""; }; 753541C019C0462D00B7F2BD /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -56,7 +56,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 228F2AC11F3D264E00DD4F43 /* Carnival.framework in Frameworks */, + 22BF4BC11F94353000B861FC /* Carnival.framework in Frameworks */, 75DAC1FE19C061C6007F4332 /* libz.dylib in Frameworks */, 75DAC20319C0626F007F4332 /* CoreGraphics.framework in Frameworks */, 75DAC20419C0626F007F4332 /* CoreLocation.framework in Frameworks */, @@ -96,7 +96,7 @@ 753541BD19C0462D00B7F2BD /* SwiftExampleProject */ = { isa = PBXGroup; children = ( - 2251B10E1F3D249A004CEE85 /* Carnival.framework */, + 22BF4BC01F94353000B861FC /* Carnival.framework */, 753541C019C0462D00B7F2BD /* AppDelegate.swift */, 753541C219C0462D00B7F2BD /* ViewController.swift */, 753541C419C0462D00B7F2BD /* Main.storyboard */, diff --git a/SwiftExampleProject/SwiftExampleProject/Carnival.framework/Carnival b/SwiftExampleProject/SwiftExampleProject/Carnival.framework/Carnival index 4460598..5148f08 100755 Binary files a/SwiftExampleProject/SwiftExampleProject/Carnival.framework/Carnival and b/SwiftExampleProject/SwiftExampleProject/Carnival.framework/Carnival differ diff --git a/SwiftExampleProject/SwiftExampleProject/Carnival.framework/Headers/Carnival.h b/SwiftExampleProject/SwiftExampleProject/Carnival.framework/Headers/Carnival.h index 4ac9a7a..6a0688c 100644 --- a/SwiftExampleProject/SwiftExampleProject/Carnival.framework/Headers/Carnival.h +++ b/SwiftExampleProject/SwiftExampleProject/Carnival.framework/Headers/Carnival.h @@ -15,7 +15,7 @@ #import "CarnivalAttributes.h" #import "CarnivalLogger.h" -#define CARNIVAL_VERSION @"6.1.4" +#define CARNIVAL_VERSION @"7.0.0" FOUNDATION_EXPORT double CarnivalSDKVersionNumber; FOUNDATION_EXPORT const unsigned char CarnivalSDKVersionString[]; @@ -52,20 +52,6 @@ NS_ASSUME_NONNULL_END */ + (void)startEngine:(nonnull NSString *)appKey; -/** - * Sets the Carnival appKey credentials for this app, and the UIUserNotificationType at the same time. - * - * @param appKey The appKey you recieved when setting up your app at http://app.carnivalmobile.com . - * @param types The UIUserNotificationType attributes you wish to register this app for as defined in UIApplication.h - * see appledocs for more information. If targeting, iOS 7 users, please use UIUserNotificationType anyway. - * @discussion An exception will be raised if you do not set your appKey before you call any other methods. - * Make sure your app bundle identifier is the same as whatever it is on http://app.carnivalmobile.com . - * - * @warning It is important that this method is called at the earliest possible opportunity (e.g. application:didFinishLaunchingWithOptions:), - * calling it later in the app lifecycle can have unintended consequences. No startEngine: calls (overrides included) must not be called more than once. - */ -+ (void)startEngine:(nonnull NSString *)appKey andNotificationTypes:(UIUserNotificationType)types; - /** * Sets the Carnival appKey credentials for this app and optionally registers for push notifications with the badge, alert and sound UIUserNotificationType's * diff --git a/SwiftExampleProject/SwiftExampleProject/Carnival.framework/Info.plist b/SwiftExampleProject/SwiftExampleProject/Carnival.framework/Info.plist index c832369..4bdddbe 100644 Binary files a/SwiftExampleProject/SwiftExampleProject/Carnival.framework/Info.plist and b/SwiftExampleProject/SwiftExampleProject/Carnival.framework/Info.plist differ