Carnival iOS SDK 6.1.0

Carnival.embeddedframework/Carnival.framework/Versions/A/Headers/Carnival.h → Carnival.framework/Headers/Carnival.h

@@ -15,7 +15,9 @@
 #import "CarnivalAttributes.h"
 #import "CarnivalLogger.h"
 
-#define CARNIVAL_VERSION @"6.0.0"
+#define CARNIVAL_VERSION @"6.1.0"
+FOUNDATION_EXPORT double CarnivalSDKVersionNumber;
+FOUNDATION_EXPORT const unsigned char CarnivalSDKVersionString[];
 
 typedef NS_OPTIONS(NSUInteger, CarnivalDeviceDataType) {
     CarnivalDeviceDataTypeAttributes     = 1 << 0,
@@ -221,7 +223,7 @@ NS_ASSUME_NONNULL_END
  *  Enabled location tracking based on IP Address. Tracking location tracking is enabled by default.
  *  Use this method for users who may not want to have their location tracked at all.
  *
- *  @param disabled A boolean value indicating whether or not to disable location based on IP Address.
+ *  @param enabled A boolean value indicating whether or not to disable location based on IP Address.
  */
 + (void)setGeoIPTrackingEnabled:(BOOL)enabled;
 
@@ -230,15 +232,15 @@ NS_ASSUME_NONNULL_END
  *  Warning: This is for advanced uses where in some cases, crash handlers from Test Flight or Fabric (Crashlytics) interrupt Carnival crash detection.
  *  If you are not experiencing these issues, do not use this method. 
  *
- *  @param disabled A boolean value indicating whether or not to install the crash handlers. Defaults to YES.
+ *  @param enabled A boolean value indicating whether or not to install the crash handlers. Defaults to YES.
  */
 + (void)setCrashHandlersEnabled:(BOOL)enabled;
 
 /**
  *  Enable automatic integration for Carnival. This must be called BEFORE startEngine, or its overloads.
  *  Warning: This is for advanced uses where you may not want Carnival to swizzle the following UIApplicationDelegate methods:
  *  application:didRegisterForRemoteNotificationsWithDeviceToken:, application:didReceiveRemoteNotification:, application:didReceiveRemoteNotification:fetchCompletionHandler:
- *  @param disabled A boolean value indicating whether or not to swizzle notification related methods. Defaults to YES.
+ *  @param enabled A boolean value indicating whether or not to swizzle notification related methods. Defaults to YES.
  */
 + (void)setAutoIntegrationEnabled:(BOOL)enabled;
 

Carnival.embeddedframework/Carnival.framework/Versions/A/Headers/CarnivalAttributes.h → Carnival.framework/Headers/CarnivalAttributes.h

@@ -81,7 +81,7 @@ typedef NS_ENUM(NSInteger, CarnivalAttributesMergeRule) {
 /**
  *  Sets a float object for a given key. The key must not be nil.
  *
- *  @param aFloaat The float to set. 
+ *  @param aFloat The float to set.
  *  @param key The key to set.
  */
 - (void)setFloat:(CGFloat)aFloat forKey:(nonnull NSString *)key;
@@ -101,4 +101,4 @@ typedef NS_ENUM(NSInteger, CarnivalAttributesMergeRule) {
  */
 - (void)setAttributesMergeRule:(CarnivalAttributesMergeRule)mergeRule;
 
-@end
+@end

Carnival.framework/Modules/module.modulemap

@@ -0,0 +1,6 @@
+framework module Carnival {
+  umbrella header "Carnival-umbrella.h"
+
+  export *
+  module * { export * }
+}

Carnival.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 	s.name 				= 'Carnival'
-	s.version 			= '6.0.0'
+	s.version 			= '6.1.0'
 	s.summary 			= 'Carnival iOS SDK for integrating with http://carnival.io messaging and analytics service.'
 	s.author			= {
 		'Carnival Mobile' => '[email protected]'
@@ -10,16 +10,16 @@ Pod::Spec.new do |s|
 		:git => 'https://github.com/carnivalmobile/carnival-ios-sdk.git',
 		:tag => s.version.to_s
 	} 
-	s.source_files = 'Carnival.embeddedframework/Carnival.framework/Versions/A/Headers/*.h'
+	s.source_files = 'Carnival.framework/Headers/*.h'
 	s.xcconfig 			= {
 		'FRAMEWORK_SEARCH_PATHS' => '"$(PODS_ROOT)/Carnival/**"'
 	}
 	s.platform = :ios
 	s.ios.deployment_target = '8.0' 
-	s.resources 		= 'Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle' 
-	s.public_header_files = 'Carnival.embeddedframework/Carnival.framework/Versions/A/Headers/*.h'
-	s.vendored_frameworks = 'Carnival.embeddedframework/Carnival.framework'
-	s.preserve_paths 	= 'Carnival.embeddedframework/Carnival.framework' 
+	s.resources 		= 'Carnival.framework/*.png' 
+	s.public_header_files = 'Carnival.framework/Headers/*.h'
+	s.vendored_frameworks = 'Carnival.framework'
+	s.preserve_paths 	= 'Carnival.framework' 
 	s.frameworks 		= 'UIKit', 'Foundation', 'CoreLocation', 'CoreGraphics', 'AVFoundation', 'MediaPlayer', 'QuartzCore', 'Security'
 	s.license = {:type => 'commercial', :text =>'Please refer to our privacy policy and terms of service at http://carnival.io'}
 	s.requires_arc = true

ExampleProject/ExampleProject.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		227BFB801E5B738E00AD6CE3 /* Carnival.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 227BFB7F1E5B738E00AD6CE3 /* Carnival.framework */; };
 		228702781CAA2B120087E877 /* Carnival.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 228702751CAA2B120087E877 /* Carnival.framework */; };
 		22B325F41C6153A700A7056D /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22B325F31C6153A700A7056D /* Security.framework */; };
 		758D6AF419AE915600F09C8D /* (null) in Resources */ = {isa = PBXBuildFile; };
@@ -24,11 +25,10 @@
 		75D77B2D19F0778300BD2319 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 75D77B2C19F0778300BD2319 /* CoreGraphics.framework */; };
 		75D77B2F19F0779600BD2319 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 75D77B2E19F0779600BD2319 /* CoreLocation.framework */; };
 		75D77B3119F077A500BD2319 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 75D77B3019F077A500BD2319 /* QuartzCore.framework */; };
-		8A3C40B41E31A9090017AEBC /* Carnival.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A3C40B11E31A9090017AEBC /* Carnival.framework */; };
-		8A3C40B51E31A9090017AEBC /* CarnivalResources.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 8A3C40B31E31A9090017AEBC /* CarnivalResources.bundle */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		227BFB7F1E5B738E00AD6CE3 /* Carnival.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Carnival.framework; sourceTree = "<group>"; };
 		228702751CAA2B120087E877 /* Carnival.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Carnival.framework; sourceTree = "<group>"; };
 		22B325F31C6153A700A7056D /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
 		7566D52919F9B984007D5D27 /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; };
@@ -51,16 +51,14 @@
 		75D77B2C19F0778300BD2319 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 		75D77B2E19F0779600BD2319 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
 		75D77B3019F077A500BD2319 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
-		8A3C40B11E31A9090017AEBC /* Carnival.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Carnival.framework; sourceTree = "<group>"; };
-		8A3C40B31E31A9090017AEBC /* CarnivalResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = CarnivalResources.bundle; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		758E8D82186367C900A8AFA4 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				8A3C40B41E31A9090017AEBC /* Carnival.framework in Frameworks */,
+				227BFB801E5B738E00AD6CE3 /* Carnival.framework in Frameworks */,
 				22B325F41C6153A700A7056D /* Security.framework in Frameworks */,
 				75D77B3119F077A500BD2319 /* QuartzCore.framework in Frameworks */,
 				75D77B2F19F0779600BD2319 /* CoreLocation.framework in Frameworks */,
@@ -112,7 +110,7 @@
 		758E8D8E186367C900A8AFA4 /* ExampleProject */ = {
 			isa = PBXGroup;
 			children = (
-				8A3C40B01E31A9090017AEBC /* Carnival.embeddedframework */,
+				227BFB7F1E5B738E00AD6CE3 /* Carnival.framework */,
 				758E8D97186367C900A8AFA4 /* ExampleAppDelegate.h */,
 				758E8D98186367C900A8AFA4 /* ExampleAppDelegate.m */,
 				758E8DA0186367C900A8AFA4 /* ExampleViewController.h */,
@@ -136,23 +134,6 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		8A3C40B01E31A9090017AEBC /* Carnival.embeddedframework */ = {
-			isa = PBXGroup;
-			children = (
-				8A3C40B11E31A9090017AEBC /* Carnival.framework */,
-				8A3C40B21E31A9090017AEBC /* Resources */,
-			);
-			path = Carnival.embeddedframework;
-			sourceTree = "<group>";
-		};
-		8A3C40B21E31A9090017AEBC /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				8A3C40B31E31A9090017AEBC /* CarnivalResources.bundle */,
-			);
-			path = Resources;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -181,6 +162,11 @@
 			attributes = {
 				LastUpgradeCheck = 0600;
 				ORGANIZATIONNAME = "Carnival Labs";
+				TargetAttributes = {
+					758E8D84186367C900A8AFA4 = {
+						ProvisioningStyle = Manual;
+					};
+				};
 			};
 			buildConfigurationList = 758E8D80186367C900A8AFA4 /* Build configuration list for PBXProject "ExampleProject" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -208,7 +194,6 @@
 				758E8D9F186367C900A8AFA4 /* Main_iPad.storyboard in Resources */,
 				758E8D9C186367C900A8AFA4 /* Main_iPhone.storyboard in Resources */,
 				758D6AF419AE915600F09C8D /* (null) in Resources */,
-				8A3C40B51E31A9090017AEBC /* CarnivalResources.bundle in Resources */,
 				758E8DA4186367C900A8AFA4 /* Images.xcassets in Resources */,
 				758E8D93186367C900A8AFA4 /* InfoPlist.strings in Resources */,
 			);
@@ -340,6 +325,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_MODULES_AUTOLINK = NO;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/ExampleProject/Carnival.embeddedframework",
@@ -351,6 +337,7 @@
 				GCC_PREFIX_HEADER = "ExampleProject/ExampleProject-Prefix.pch";
 				INFOPLIST_FILE = "ExampleProject/ExampleProject-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.carnivalmobile.ExampleProject;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				WRAPPER_EXTENSION = app;
@@ -364,6 +351,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_MODULES_AUTOLINK = NO;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/ExampleProject/Carnival.embeddedframework",
@@ -375,6 +363,7 @@
 				GCC_PREFIX_HEADER = "ExampleProject/ExampleProject-Prefix.pch";
 				INFOPLIST_FILE = "ExampleProject/ExampleProject-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				PRODUCT_BUNDLE_IDENTIFIER = com.carnivalmobile.ExampleProject;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
 				WRAPPER_EXTENSION = app;