diff --git a/Carnival.framework/Carnival b/Carnival.framework/Carnival index 767adc3..84e38a9 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 b0eff55..aa20183 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.1" +#define CARNIVAL_VERSION @"6.1.2" FOUNDATION_EXPORT double CarnivalSDKVersionNumber; FOUNDATION_EXPORT const unsigned char CarnivalSDKVersionString[]; diff --git a/Carnival.framework/Info.plist b/Carnival.framework/Info.plist index 0d54d5d..af7b500 100644 Binary files a/Carnival.framework/Info.plist and b/Carnival.framework/Info.plist differ diff --git a/Carnival.podspec b/Carnival.podspec index faaeaa5..fde918b 100644 --- a/Carnival.podspec +++ b/Carnival.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Carnival' - s.version = '6.1.1' + s.version = '6.1.2' s.summary = 'Carnival iOS SDK for integrating with http://carnival.io messaging and analytics service.' s.author = { 'Carnival Mobile' => 'support@sailthru.com' @@ -20,7 +20,7 @@ Pod::Spec.new do |s| s.public_header_files = 'Carnival.framework/Headers/*.h' s.vendored_frameworks = 'Carnival.framework' s.preserve_paths = 'Carnival.framework' - s.frameworks = 'UIKit', 'Foundation', 'CoreLocation', 'CoreGraphics', 'QuartzCore', 'Security' + s.frameworks = 'UIKit', 'Foundation', 'CoreLocation', 'CoreGraphics', 'QuartzCore' s.license = {:type => 'commercial', :text =>'Please refer to our privacy policy and terms of service at http://carnival.io'} s.requires_arc = true end diff --git a/ExampleProject/ExampleProject.xcodeproj/project.pbxproj b/ExampleProject/ExampleProject.xcodeproj/project.pbxproj index 691bd0e..b12699f 100644 --- a/ExampleProject/ExampleProject.xcodeproj/project.pbxproj +++ b/ExampleProject/ExampleProject.xcodeproj/project.pbxproj @@ -8,6 +8,8 @@ /* Begin PBXBuildFile section */ 221C3AA31EB9687300DB116C /* Carnival.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 221C3AA21EB9687300DB116C /* Carnival.framework */; }; + 22587F931ED3ABF200AA28D0 /* Carnival.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 221C3AA21EB9687300DB116C /* Carnival.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 22587F981ED3ACF800AA28D0 /* Carnival.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22587F971ED3ACF800AA28D0 /* 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; }; @@ -27,8 +29,23 @@ 75D77B3119F077A500BD2319 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 75D77B3019F077A500BD2319 /* QuartzCore.framework */; }; /* End PBXBuildFile section */ +/* Begin PBXCopyFilesBuildPhase section */ + 22587F941ED3ABF200AA28D0 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 22587F931ED3ABF200AA28D0 /* Carnival.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ - 221C3AA21EB9687300DB116C /* Carnival.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Carnival.framework; sourceTree = ""; }; + 221C3AA21EB9687300DB116C /* Carnival.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carnival.framework; path = "/Users/sam/Code/carnival-ios-sdk-source/ExampleProject/ExampleProject/Carnival.framework"; sourceTree = ""; }; + 22587F971ED3ACF800AA28D0 /* Carnival.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Carnival.framework; sourceTree = ""; }; 228702751CAA2B120087E877 /* 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; }; 7566D52919F9B984007D5D27 /* AdSupport.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AdSupport.framework; path = System/Library/Frameworks/AdSupport.framework; sourceTree = SDKROOT; }; @@ -68,6 +85,7 @@ 228702781CAA2B120087E877 /* Carnival.framework in Frameworks */, 758E8D8D186367C900A8AFA4 /* UIKit.framework in Frameworks */, 758E8D89186367C900A8AFA4 /* Foundation.framework in Frameworks */, + 22587F981ED3ACF800AA28D0 /* Carnival.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -110,7 +128,7 @@ 758E8D8E186367C900A8AFA4 /* ExampleProject */ = { isa = PBXGroup; children = ( - 221C3AA21EB9687300DB116C /* Carnival.framework */, + 22587F971ED3ACF800AA28D0 /* Carnival.framework */, 758E8D97186367C900A8AFA4 /* ExampleAppDelegate.h */, 758E8D98186367C900A8AFA4 /* ExampleAppDelegate.m */, 758E8DA0186367C900A8AFA4 /* ExampleViewController.h */, @@ -144,6 +162,7 @@ 758E8D81186367C900A8AFA4 /* Sources */, 758E8D82186367C900A8AFA4 /* Frameworks */, 758E8D83186367C900A8AFA4 /* Resources */, + 22587F941ED3ABF200AA28D0 /* Embed Frameworks */, ); buildRules = ( ); @@ -164,7 +183,8 @@ ORGANIZATIONNAME = "Carnival Labs"; TargetAttributes = { 758E8D84186367C900A8AFA4 = { - ProvisioningStyle = Manual; + DevelopmentTeam = 9ZEH62KRVF; + ProvisioningStyle = Automatic; }; }; }; @@ -325,7 +345,8 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CLANG_MODULES_AUTOLINK = NO; - DEVELOPMENT_TEAM = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEVELOPMENT_TEAM = 9ZEH62KRVF; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/ExampleProject/Carnival.embeddedframework", @@ -337,6 +358,7 @@ GCC_PREFIX_HEADER = "ExampleProject/ExampleProject-Prefix.pch"; INFOPLIST_FILE = "ExampleProject/ExampleProject-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.carnivalmobile.ExampleProject; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; @@ -351,7 +373,8 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CLANG_MODULES_AUTOLINK = NO; - DEVELOPMENT_TEAM = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + DEVELOPMENT_TEAM = 9ZEH62KRVF; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/ExampleProject/Carnival.embeddedframework", @@ -363,6 +386,7 @@ GCC_PREFIX_HEADER = "ExampleProject/ExampleProject-Prefix.pch"; INFOPLIST_FILE = "ExampleProject/ExampleProject-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.carnivalmobile.ExampleProject; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; diff --git a/ExampleProject/ExampleProject/ExampleAppDelegate.m b/ExampleProject/ExampleProject/ExampleAppDelegate.m index df93ab4..b87d3e0 100644 --- a/ExampleProject/ExampleProject/ExampleAppDelegate.m +++ b/ExampleProject/ExampleProject/ExampleAppDelegate.m @@ -17,9 +17,9 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( // Register with Carnival using the startEngine method using the app key for your app which you can get from http://app.carnivalmobile.com // Could instead use the startEngine methods to customize start up. - #error Insert your app key that you got from http://app.carnivalmobile.com here, then remove this line + //#error Insert your app key that you got from http://app.carnivalmobile.com here, then remove this line - [Carnival startEngine:app key]; + [Carnival startEngine:@"1234"]; return YES; } diff --git a/SwiftExampleProject/SwiftExampleProject.xcodeproj/project.pbxproj b/SwiftExampleProject/SwiftExampleProject.xcodeproj/project.pbxproj index 54da13c..ff75c15 100644 --- a/SwiftExampleProject/SwiftExampleProject.xcodeproj/project.pbxproj +++ b/SwiftExampleProject/SwiftExampleProject.xcodeproj/project.pbxproj @@ -7,8 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - 221C3AA61EB96A3E00DB116C /* Carnival.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 221C3AA41EB9688400DB116C /* Carnival.framework */; }; - 221C3AA71EB96A3E00DB116C /* Carnival.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 221C3AA41EB9688400DB116C /* Carnival.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 22587F961ED3ACF200AA28D0 /* Carnival.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22587F951ED3ACF200AA28D0 /* Carnival.framework */; }; 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 +26,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 221C3AA71EB96A3E00DB116C /* Carnival.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -35,7 +33,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 221C3AA41EB9688400DB116C /* Carnival.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Carnival.framework; sourceTree = ""; }; + 22587F951ED3ACF200AA28D0 /* Carnival.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Carnival.framework; sourceTree = ""; }; 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 = ""; }; @@ -47,7 +45,6 @@ 753541D619C0462D00B7F2BD /* SwiftExampleProjectTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftExampleProjectTests.swift; sourceTree = ""; }; 7535425719C04B9C00B7F2BD /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; 7535425919C04BA300B7F2BD /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = System/Library/Frameworks/MediaPlayer.framework; sourceTree = SDKROOT; }; - 7535426C19C05B4B00B7F2BD /* Carnival-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Carnival-Bridging-Header.h"; sourceTree = ""; }; 75DAC1FD19C061C6007F4332 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; 75DAC1FF19C0624F007F4332 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; 75DAC20119C06256007F4332 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; @@ -58,7 +55,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 221C3AA61EB96A3E00DB116C /* Carnival.framework in Frameworks */, + 22587F961ED3ACF200AA28D0 /* Carnival.framework in Frameworks */, 75DAC1FE19C061C6007F4332 /* libz.dylib in Frameworks */, 75DAC20319C0626F007F4332 /* CoreGraphics.framework in Frameworks */, 75DAC20419C0626F007F4332 /* CoreLocation.framework in Frameworks */, @@ -150,8 +147,7 @@ 7535426B19C05B4B00B7F2BD /* Carnival */ = { isa = PBXGroup; children = ( - 221C3AA41EB9688400DB116C /* Carnival.framework */, - 7535426C19C05B4B00B7F2BD /* Carnival-Bridging-Header.h */, + 22587F951ED3ACF200AA28D0 /* Carnival.framework */, ); path = Carnival; sourceTree = ""; @@ -184,7 +180,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0700; - LastUpgradeCheck = 0600; + LastUpgradeCheck = 0820; ORGANIZATIONNAME = "Carnival Labs"; TargetAttributes = { 753541BA19C0462D00B7F2BD = { @@ -261,15 +257,19 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -303,8 +303,10 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -312,6 +314,7 @@ ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -321,6 +324,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -341,8 +345,9 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = "$(inherited)"; + PRODUCT_BUNDLE_IDENTIFIER = "com.carnivalmobile.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "SwiftExampleProject/Vendor/Carnival/Carnival-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VALID_ARCHS = "arm64 armv7 armv7s x86_64"; @@ -365,8 +370,9 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = "$(inherited)"; + PRODUCT_BUNDLE_IDENTIFIER = "com.carnivalmobile.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "SwiftExampleProject/Vendor/Carnival/Carnival-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = ""; SWIFT_VERSION = 3.0; TARGETED_DEVICE_FAMILY = "1,2"; VALID_ARCHS = "arm64 armv7 armv7s x86_64"; diff --git a/SwiftExampleProject/SwiftExampleProject/Info.plist b/SwiftExampleProject/SwiftExampleProject/Info.plist index 97b0f31..e009cd2 100644 --- a/SwiftExampleProject/SwiftExampleProject/Info.plist +++ b/SwiftExampleProject/SwiftExampleProject/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - com.carnivalmobile.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -22,6 +22,12 @@ 1 LSRequiresIPhoneOS + NSLocationAlwaysUsageDescription + Always usage description + NSLocationUsageDescription + Location usage description + NSLocationWhenInUseUsageDescription + When-in-use usage description UIMainStoryboardFile Main UIRequiredDeviceCapabilities @@ -36,11 +42,5 @@ UIViewControllerBasedStatusBarAppearance - NSLocationAlwaysUsageDescription - Always usage description - NSLocationWhenInUseUsageDescription - When-in-use usage description - NSLocationUsageDescription - Location usage description diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival-Bridging-Header.h b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival-Bridging-Header.h deleted file mode 100644 index 6fc30fc..0000000 --- a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival-Bridging-Header.h +++ /dev/null @@ -1,12 +0,0 @@ -// -// Carnival-Bridging-Header.h -// SwiftExampleProject -// -// Created by Carnival Mobile -// Copyright (c) 2015 Carnival Mobile. All rights reserved. -// -// For documentation see http://docs.carnivalmobile.com -// - -//#import -//#import