diff --git a/Carnival.embeddedframework/Carnival.framework/Carnival b/Carnival.embeddedframework/Carnival.framework/Carnival deleted file mode 120000 index 510ecfa..0000000 --- a/Carnival.embeddedframework/Carnival.framework/Carnival +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Carnival \ No newline at end of file diff --git a/Carnival.embeddedframework/Carnival.framework/Headers b/Carnival.embeddedframework/Carnival.framework/Headers deleted file mode 120000 index a177d2a..0000000 --- a/Carnival.embeddedframework/Carnival.framework/Headers +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Headers \ No newline at end of file diff --git a/Carnival.embeddedframework/Carnival.framework/Resources b/Carnival.embeddedframework/Carnival.framework/Resources deleted file mode 120000 index 953ee36..0000000 --- a/Carnival.embeddedframework/Carnival.framework/Resources +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Resources \ No newline at end of file diff --git a/Carnival.embeddedframework/Carnival.framework/Versions/A/Carnival b/Carnival.embeddedframework/Carnival.framework/Versions/A/Carnival deleted file mode 100644 index 5842bf2..0000000 Binary files a/Carnival.embeddedframework/Carnival.framework/Versions/A/Carnival and /dev/null differ diff --git a/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/Info.plist b/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/Info.plist deleted file mode 100644 index df9b881..0000000 Binary files a/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/Info.plist and /dev/null differ diff --git a/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/en.lproj/InfoPlist.strings b/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/en.lproj/InfoPlist.strings deleted file mode 100644 index 3967e06..0000000 Binary files a/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/en.lproj/InfoPlist.strings and /dev/null differ diff --git a/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/load_failure.html b/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/load_failure.html deleted file mode 100644 index 95d00ac..0000000 --- a/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/load_failure.html +++ /dev/null @@ -1,79 +0,0 @@ - - - - - Error! - - - - - -
-
-

Whoops

-

- Something went wrong and we
couldn't load the page you
requested. -

-
- - refresh - -

Try Again

-
-
- - \ No newline at end of file diff --git a/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/Info.plist b/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/Info.plist deleted file mode 100644 index f668290..0000000 Binary files a/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/Info.plist and /dev/null differ diff --git a/Carnival.embeddedframework/Carnival.framework/Versions/Current b/Carnival.embeddedframework/Carnival.framework/Versions/Current deleted file mode 120000 index 8c7e5a6..0000000 --- a/Carnival.embeddedframework/Carnival.framework/Versions/Current +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/Carnival.embeddedframework/Resources/CarnivalResources.bundle b/Carnival.embeddedframework/Resources/CarnivalResources.bundle deleted file mode 120000 index 2a16abf..0000000 --- a/Carnival.embeddedframework/Resources/CarnivalResources.bundle +++ /dev/null @@ -1 +0,0 @@ -../Carnival.framework/Resources/CarnivalResources.bundle \ No newline at end of file diff --git a/Carnival.framework/Carnival b/Carnival.framework/Carnival new file mode 100755 index 0000000..df02cb0 Binary files /dev/null and b/Carnival.framework/Carnival differ diff --git a/Carnival.embeddedframework/Carnival.framework/Versions/A/Headers/Carnival.h b/Carnival.framework/Headers/Carnival.h similarity index 95% rename from Carnival.embeddedframework/Carnival.framework/Versions/A/Headers/Carnival.h rename to Carnival.framework/Headers/Carnival.h index f09ae2c..132b79b 100644 --- a/Carnival.embeddedframework/Carnival.framework/Versions/A/Headers/Carnival.h +++ b/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,7 +232,7 @@ 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; @@ -238,7 +240,7 @@ NS_ASSUME_NONNULL_END * 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; diff --git a/Carnival.embeddedframework/Carnival.framework/Versions/A/Headers/CarnivalAttributes.h b/Carnival.framework/Headers/CarnivalAttributes.h similarity index 98% rename from Carnival.embeddedframework/Carnival.framework/Versions/A/Headers/CarnivalAttributes.h rename to Carnival.framework/Headers/CarnivalAttributes.h index a2b868d..9245335 100644 --- a/Carnival.embeddedframework/Carnival.framework/Versions/A/Headers/CarnivalAttributes.h +++ b/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 \ No newline at end of file +@end diff --git a/Carnival.embeddedframework/Carnival.framework/Versions/A/Headers/CarnivalLogger.h b/Carnival.framework/Headers/CarnivalLogger.h similarity index 100% rename from Carnival.embeddedframework/Carnival.framework/Versions/A/Headers/CarnivalLogger.h rename to Carnival.framework/Headers/CarnivalLogger.h diff --git a/Carnival.embeddedframework/Carnival.framework/Versions/A/Headers/CarnivalMessage.h b/Carnival.framework/Headers/CarnivalMessage.h similarity index 100% rename from Carnival.embeddedframework/Carnival.framework/Versions/A/Headers/CarnivalMessage.h rename to Carnival.framework/Headers/CarnivalMessage.h diff --git a/Carnival.embeddedframework/Carnival.framework/Versions/A/Headers/CarnivalMessageStream.h b/Carnival.framework/Headers/CarnivalMessageStream.h similarity index 100% rename from Carnival.embeddedframework/Carnival.framework/Versions/A/Headers/CarnivalMessageStream.h rename to Carnival.framework/Headers/CarnivalMessageStream.h diff --git a/Carnival.framework/Info.plist b/Carnival.framework/Info.plist new file mode 100644 index 0000000..2475b3a Binary files /dev/null and b/Carnival.framework/Info.plist differ diff --git a/Carnival.framework/Modules/module.modulemap b/Carnival.framework/Modules/module.modulemap new file mode 100644 index 0000000..d234d9b --- /dev/null +++ b/Carnival.framework/Modules/module.modulemap @@ -0,0 +1,6 @@ +framework module Carnival { + umbrella header "Carnival-umbrella.h" + + export * + module * { export * } +} diff --git a/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_close_button@2x.png b/Carnival.framework/cp_close_button@2x.png similarity index 100% rename from Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_close_button@2x.png rename to Carnival.framework/cp_close_button@2x.png diff --git a/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_close_button_white@2x.png b/Carnival.framework/cp_close_button_white@2x.png similarity index 100% rename from Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_close_button_white@2x.png rename to Carnival.framework/cp_close_button_white@2x.png diff --git a/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_message_close_button@2x.png b/Carnival.framework/cp_message_close_button@2x.png similarity index 100% rename from Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_message_close_button@2x.png rename to Carnival.framework/cp_message_close_button@2x.png diff --git a/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_refresh.png b/Carnival.framework/cp_refresh.png similarity index 100% rename from Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_refresh.png rename to Carnival.framework/cp_refresh.png diff --git a/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7@2x~ipad.png b/Carnival.framework/cp_safari-7@2x~ipad.png similarity index 100% rename from Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7@2x~ipad.png rename to Carnival.framework/cp_safari-7@2x~ipad.png diff --git a/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7@2x~iphone.png b/Carnival.framework/cp_safari-7@2x~iphone.png similarity index 100% rename from Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7@2x~iphone.png rename to Carnival.framework/cp_safari-7@2x~iphone.png diff --git a/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7@3x~iphone.png b/Carnival.framework/cp_safari-7@3x~iphone.png similarity index 100% rename from Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7@3x~iphone.png rename to Carnival.framework/cp_safari-7@3x~iphone.png diff --git a/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7~ipad.png b/Carnival.framework/cp_safari-7~ipad.png similarity index 100% rename from Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7~ipad.png rename to Carnival.framework/cp_safari-7~ipad.png diff --git a/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7~iphone.png b/Carnival.framework/cp_safari-7~iphone.png similarity index 100% rename from Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7~iphone.png rename to Carnival.framework/cp_safari-7~iphone.png diff --git a/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari@2x~ipad.png b/Carnival.framework/cp_safari@2x~ipad.png similarity index 100% rename from Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari@2x~ipad.png rename to Carnival.framework/cp_safari@2x~ipad.png diff --git a/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari@2x~iphone.png b/Carnival.framework/cp_safari@2x~iphone.png similarity index 100% rename from Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari@2x~iphone.png rename to Carnival.framework/cp_safari@2x~iphone.png diff --git a/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari@3x~iphone.png b/Carnival.framework/cp_safari@3x~iphone.png similarity index 100% rename from Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari@3x~iphone.png rename to Carnival.framework/cp_safari@3x~iphone.png diff --git a/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari~ipad.png b/Carnival.framework/cp_safari~ipad.png similarity index 100% rename from Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari~ipad.png rename to Carnival.framework/cp_safari~ipad.png diff --git a/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari~iphone.png b/Carnival.framework/cp_safari~iphone.png similarity index 100% rename from Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari~iphone.png rename to Carnival.framework/cp_safari~iphone.png diff --git a/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_share_button_white@2x.png b/Carnival.framework/cp_share_button_white@2x.png similarity index 100% rename from Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_share_button_white@2x.png rename to Carnival.framework/cp_share_button_white@2x.png diff --git a/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_stream_back_button@2x.png b/Carnival.framework/cp_stream_back_button@2x.png similarity index 100% rename from Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_stream_back_button@2x.png rename to Carnival.framework/cp_stream_back_button@2x.png diff --git a/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_stream_back_button_white@2x.png b/Carnival.framework/cp_stream_back_button_white@2x.png similarity index 100% rename from Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_stream_back_button_white@2x.png rename to Carnival.framework/cp_stream_back_button_white@2x.png diff --git a/Carnival.podspec b/Carnival.podspec index 7c58548..a4a4d49 100644 --- a/Carnival.podspec +++ b/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' => 'support@sailthru.com' @@ -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 diff --git a/ExampleProject/ExampleProject.xcodeproj/project.pbxproj b/ExampleProject/ExampleProject.xcodeproj/project.pbxproj index b618ae1..52d4fe6 100644 --- a/ExampleProject/ExampleProject.xcodeproj/project.pbxproj +++ b/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 = ""; }; 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; }; @@ -51,8 +51,6 @@ 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 = ""; }; - 8A3C40B31E31A9090017AEBC /* CarnivalResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = CarnivalResources.bundle; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -60,7 +58,7 @@ 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 = ""; }; - 8A3C40B01E31A9090017AEBC /* Carnival.embeddedframework */ = { - isa = PBXGroup; - children = ( - 8A3C40B11E31A9090017AEBC /* Carnival.framework */, - 8A3C40B21E31A9090017AEBC /* Resources */, - ); - path = Carnival.embeddedframework; - sourceTree = ""; - }; - 8A3C40B21E31A9090017AEBC /* Resources */ = { - isa = PBXGroup; - children = ( - 8A3C40B31E31A9090017AEBC /* CarnivalResources.bundle */, - ); - path = Resources; - sourceTree = ""; - }; /* 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; diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Carnival b/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Carnival deleted file mode 120000 index 510ecfa..0000000 --- a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Carnival +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Carnival \ No newline at end of file diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Headers b/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Headers deleted file mode 120000 index a177d2a..0000000 --- a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Headers +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Headers \ No newline at end of file diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Resources b/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Resources deleted file mode 120000 index 953ee36..0000000 --- a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Resources +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Resources \ No newline at end of file diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Carnival b/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Carnival deleted file mode 100644 index 6a80b15..0000000 Binary files a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Carnival and /dev/null differ diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/Info.plist b/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/Info.plist deleted file mode 100644 index d517c0f..0000000 Binary files a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/Info.plist and /dev/null differ diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/en.lproj/InfoPlist.strings b/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/en.lproj/InfoPlist.strings deleted file mode 100644 index 3967e06..0000000 Binary files a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/en.lproj/InfoPlist.strings and /dev/null differ diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/load_failure.html b/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/load_failure.html deleted file mode 100644 index 95d00ac..0000000 --- a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/load_failure.html +++ /dev/null @@ -1,79 +0,0 @@ - - - - - Error! - - - - - -
-
-

Whoops

-

- Something went wrong and we
couldn't load the page you
requested. -

-
- - refresh - -

Try Again

-
-
- - \ No newline at end of file diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/Info.plist b/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/Info.plist deleted file mode 100644 index c53ee7f..0000000 Binary files a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/Info.plist and /dev/null differ diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/Current b/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/Current deleted file mode 120000 index 8c7e5a6..0000000 --- a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/Current +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Resources/CarnivalResources.bundle b/ExampleProject/ExampleProject/Carnival.embeddedframework/Resources/CarnivalResources.bundle deleted file mode 120000 index 2a16abf..0000000 --- a/ExampleProject/ExampleProject/Carnival.embeddedframework/Resources/CarnivalResources.bundle +++ /dev/null @@ -1 +0,0 @@ -../Carnival.framework/Resources/CarnivalResources.bundle \ No newline at end of file diff --git a/ExampleProject/ExampleProject/Carnival.framework/Carnival b/ExampleProject/ExampleProject/Carnival.framework/Carnival new file mode 100755 index 0000000..0b74bad Binary files /dev/null and b/ExampleProject/ExampleProject/Carnival.framework/Carnival differ diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Headers/Carnival.h b/ExampleProject/ExampleProject/Carnival.framework/Headers/Carnival.h similarity index 95% rename from ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Headers/Carnival.h rename to ExampleProject/ExampleProject/Carnival.framework/Headers/Carnival.h index f09ae2c..132b79b 100644 --- a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Headers/Carnival.h +++ b/ExampleProject/ExampleProject/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,7 +232,7 @@ 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; @@ -238,7 +240,7 @@ NS_ASSUME_NONNULL_END * 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; diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Headers/CarnivalAttributes.h b/ExampleProject/ExampleProject/Carnival.framework/Headers/CarnivalAttributes.h similarity index 98% rename from SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Headers/CarnivalAttributes.h rename to ExampleProject/ExampleProject/Carnival.framework/Headers/CarnivalAttributes.h index a2b868d..9245335 100644 --- a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Headers/CarnivalAttributes.h +++ b/ExampleProject/ExampleProject/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 \ No newline at end of file +@end diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Headers/CarnivalLogger.h b/ExampleProject/ExampleProject/Carnival.framework/Headers/CarnivalLogger.h similarity index 100% rename from ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Headers/CarnivalLogger.h rename to ExampleProject/ExampleProject/Carnival.framework/Headers/CarnivalLogger.h diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Headers/CarnivalMessage.h b/ExampleProject/ExampleProject/Carnival.framework/Headers/CarnivalMessage.h similarity index 100% rename from ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Headers/CarnivalMessage.h rename to ExampleProject/ExampleProject/Carnival.framework/Headers/CarnivalMessage.h diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Headers/CarnivalMessageStream.h b/ExampleProject/ExampleProject/Carnival.framework/Headers/CarnivalMessageStream.h similarity index 100% rename from ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Headers/CarnivalMessageStream.h rename to ExampleProject/ExampleProject/Carnival.framework/Headers/CarnivalMessageStream.h diff --git a/ExampleProject/ExampleProject/Carnival.framework/Info.plist b/ExampleProject/ExampleProject/Carnival.framework/Info.plist new file mode 100644 index 0000000..cdbee80 Binary files /dev/null and b/ExampleProject/ExampleProject/Carnival.framework/Info.plist differ diff --git a/ExampleProject/ExampleProject/Carnival.framework/Modules/module.modulemap b/ExampleProject/ExampleProject/Carnival.framework/Modules/module.modulemap new file mode 100644 index 0000000..d234d9b --- /dev/null +++ b/ExampleProject/ExampleProject/Carnival.framework/Modules/module.modulemap @@ -0,0 +1,6 @@ +framework module Carnival { + umbrella header "Carnival-umbrella.h" + + export * + module * { export * } +} diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_close_button@2x.png b/ExampleProject/ExampleProject/Carnival.framework/cp_close_button@2x.png similarity index 100% rename from ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_close_button@2x.png rename to ExampleProject/ExampleProject/Carnival.framework/cp_close_button@2x.png diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_close_button_white@2x.png b/ExampleProject/ExampleProject/Carnival.framework/cp_close_button_white@2x.png similarity index 100% rename from ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_close_button_white@2x.png rename to ExampleProject/ExampleProject/Carnival.framework/cp_close_button_white@2x.png diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_message_close_button@2x.png b/ExampleProject/ExampleProject/Carnival.framework/cp_message_close_button@2x.png similarity index 100% rename from ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_message_close_button@2x.png rename to ExampleProject/ExampleProject/Carnival.framework/cp_message_close_button@2x.png diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_refresh.png b/ExampleProject/ExampleProject/Carnival.framework/cp_refresh.png similarity index 100% rename from ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_refresh.png rename to ExampleProject/ExampleProject/Carnival.framework/cp_refresh.png diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7@2x~ipad.png b/ExampleProject/ExampleProject/Carnival.framework/cp_safari-7@2x~ipad.png similarity index 100% rename from ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7@2x~ipad.png rename to ExampleProject/ExampleProject/Carnival.framework/cp_safari-7@2x~ipad.png diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7@2x~iphone.png b/ExampleProject/ExampleProject/Carnival.framework/cp_safari-7@2x~iphone.png similarity index 100% rename from ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7@2x~iphone.png rename to ExampleProject/ExampleProject/Carnival.framework/cp_safari-7@2x~iphone.png diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7@3x~iphone.png b/ExampleProject/ExampleProject/Carnival.framework/cp_safari-7@3x~iphone.png similarity index 100% rename from ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7@3x~iphone.png rename to ExampleProject/ExampleProject/Carnival.framework/cp_safari-7@3x~iphone.png diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7~ipad.png b/ExampleProject/ExampleProject/Carnival.framework/cp_safari-7~ipad.png similarity index 100% rename from ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7~ipad.png rename to ExampleProject/ExampleProject/Carnival.framework/cp_safari-7~ipad.png diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7~iphone.png b/ExampleProject/ExampleProject/Carnival.framework/cp_safari-7~iphone.png similarity index 100% rename from ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7~iphone.png rename to ExampleProject/ExampleProject/Carnival.framework/cp_safari-7~iphone.png diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari@2x~ipad.png b/ExampleProject/ExampleProject/Carnival.framework/cp_safari@2x~ipad.png similarity index 100% rename from ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari@2x~ipad.png rename to ExampleProject/ExampleProject/Carnival.framework/cp_safari@2x~ipad.png diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari@2x~iphone.png b/ExampleProject/ExampleProject/Carnival.framework/cp_safari@2x~iphone.png similarity index 100% rename from ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari@2x~iphone.png rename to ExampleProject/ExampleProject/Carnival.framework/cp_safari@2x~iphone.png diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari@3x~iphone.png b/ExampleProject/ExampleProject/Carnival.framework/cp_safari@3x~iphone.png similarity index 100% rename from ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari@3x~iphone.png rename to ExampleProject/ExampleProject/Carnival.framework/cp_safari@3x~iphone.png diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari~ipad.png b/ExampleProject/ExampleProject/Carnival.framework/cp_safari~ipad.png similarity index 100% rename from ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari~ipad.png rename to ExampleProject/ExampleProject/Carnival.framework/cp_safari~ipad.png diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari~iphone.png b/ExampleProject/ExampleProject/Carnival.framework/cp_safari~iphone.png similarity index 100% rename from ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari~iphone.png rename to ExampleProject/ExampleProject/Carnival.framework/cp_safari~iphone.png diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_share_button_white@2x.png b/ExampleProject/ExampleProject/Carnival.framework/cp_share_button_white@2x.png similarity index 100% rename from ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_share_button_white@2x.png rename to ExampleProject/ExampleProject/Carnival.framework/cp_share_button_white@2x.png diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_stream_back_button@2x.png b/ExampleProject/ExampleProject/Carnival.framework/cp_stream_back_button@2x.png similarity index 100% rename from ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_stream_back_button@2x.png rename to ExampleProject/ExampleProject/Carnival.framework/cp_stream_back_button@2x.png diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_stream_back_button_white@2x.png b/ExampleProject/ExampleProject/Carnival.framework/cp_stream_back_button_white@2x.png similarity index 100% rename from ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_stream_back_button_white@2x.png rename to ExampleProject/ExampleProject/Carnival.framework/cp_stream_back_button_white@2x.png diff --git a/ExampleProject/ExampleProject/ExampleProject-Info.plist b/ExampleProject/ExampleProject/ExampleProject-Info.plist index 1c49758..e4052cf 100644 --- a/ExampleProject/ExampleProject/ExampleProject-Info.plist +++ b/ExampleProject/ExampleProject/ExampleProject-Info.plist @@ -9,7 +9,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - com.carnivallabs.ios.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -26,10 +26,10 @@ NSLocationAlwaysUsageDescription Always usage description - NSLocationWhenInUseUsageDescription - When-in-use usage description NSLocationUsageDescription Location usage description + NSLocationWhenInUseUsageDescription + When-in-use usage description UIMainStoryboardFile Main_iPhone UIMainStoryboardFile~ipad diff --git a/ExampleProject/ExampleProject/Images.xcassets/AppIcon.appiconset/Contents.json b/ExampleProject/ExampleProject/Images.xcassets/AppIcon.appiconset/Contents.json index 36d2c80..1d060ed 100644 --- a/ExampleProject/ExampleProject/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/ExampleProject/ExampleProject/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,15 @@ { "images" : [ + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, { "idiom" : "iphone", "size" : "29x29", @@ -30,6 +40,16 @@ "size" : "60x60", "scale" : "3x" }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "2x" + }, { "idiom" : "ipad", "size" : "29x29", @@ -59,6 +79,11 @@ "idiom" : "ipad", "size" : "76x76", "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "83.5x83.5", + "scale" : "2x" } ], "info" : { diff --git a/SwiftExampleProject/SwiftExampleProject.xcodeproj/project.pbxproj b/SwiftExampleProject/SwiftExampleProject.xcodeproj/project.pbxproj index 6c5554a..bb7fadc 100644 --- a/SwiftExampleProject/SwiftExampleProject.xcodeproj/project.pbxproj +++ b/SwiftExampleProject/SwiftExampleProject.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 227BFB821E5B739200AD6CE3 /* Carnival.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 227BFB811E5B739200AD6CE3 /* 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 */; }; @@ -16,11 +17,10 @@ 75DAC1FE19C061C6007F4332 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 75DAC1FD19C061C6007F4332 /* libz.dylib */; }; 75DAC20319C0626F007F4332 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 75DAC20119C06256007F4332 /* CoreGraphics.framework */; }; 75DAC20419C0626F007F4332 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 75DAC1FF19C0624F007F4332 /* CoreLocation.framework */; }; - 8A3C40B91E31A91F0017AEBC /* Carnival.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8A3C40B61E31A91F0017AEBC /* Carnival.framework */; }; - 8A3C40BA1E31A9200017AEBC /* CarnivalResources.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 8A3C40B81E31A91F0017AEBC /* CarnivalResources.bundle */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 227BFB811E5B739200AD6CE3 /* 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 = ""; }; @@ -36,8 +36,6 @@ 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; }; - 8A3C40B61E31A91F0017AEBC /* Carnival.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Carnival.framework; sourceTree = ""; }; - 8A3C40B81E31A91F0017AEBC /* CarnivalResources.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = CarnivalResources.bundle; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -45,7 +43,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 8A3C40B91E31A91F0017AEBC /* Carnival.framework in Frameworks */, + 227BFB821E5B739200AD6CE3 /* Carnival.framework in Frameworks */, 75DAC1FE19C061C6007F4332 /* libz.dylib in Frameworks */, 75DAC20319C0626F007F4332 /* CoreGraphics.framework in Frameworks */, 75DAC20419C0626F007F4332 /* CoreLocation.framework in Frameworks */, @@ -137,21 +135,12 @@ 7535426B19C05B4B00B7F2BD /* Carnival */ = { isa = PBXGroup; children = ( - 8A3C40B61E31A91F0017AEBC /* Carnival.framework */, - 8A3C40B71E31A91F0017AEBC /* Resources */, + 227BFB811E5B739200AD6CE3 /* Carnival.framework */, 7535426C19C05B4B00B7F2BD /* Carnival-Bridging-Header.h */, ); path = Carnival; sourceTree = ""; }; - 8A3C40B71E31A91F0017AEBC /* Resources */ = { - isa = PBXGroup; - children = ( - 8A3C40B81E31A91F0017AEBC /* CarnivalResources.bundle */, - ); - path = Resources; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -212,7 +201,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 8A3C40BA1E31A9200017AEBC /* CarnivalResources.bundle in Resources */, 753541C619C0462D00B7F2BD /* Main.storyboard in Resources */, 753541C819C0462D00B7F2BD /* Images.xcassets in Resources */, ); diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Carnival b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Carnival deleted file mode 120000 index 510ecfa..0000000 --- a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Carnival +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Carnival \ No newline at end of file diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Carnival b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Carnival new file mode 100755 index 0000000..0b74bad Binary files /dev/null and b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Carnival differ diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Headers b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Headers deleted file mode 120000 index a177d2a..0000000 --- a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Headers +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Headers \ No newline at end of file diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Headers/Carnival.h b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Headers/Carnival.h similarity index 95% rename from SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Headers/Carnival.h rename to SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Headers/Carnival.h index f09ae2c..132b79b 100644 --- a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Headers/Carnival.h +++ b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/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,7 +232,7 @@ 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; @@ -238,7 +240,7 @@ NS_ASSUME_NONNULL_END * 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; diff --git a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Headers/CarnivalAttributes.h b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Headers/CarnivalAttributes.h similarity index 98% rename from ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Headers/CarnivalAttributes.h rename to SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Headers/CarnivalAttributes.h index a2b868d..9245335 100644 --- a/ExampleProject/ExampleProject/Carnival.embeddedframework/Carnival.framework/Versions/A/Headers/CarnivalAttributes.h +++ b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/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 \ No newline at end of file +@end diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Headers/CarnivalLogger.h b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Headers/CarnivalLogger.h similarity index 100% rename from SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Headers/CarnivalLogger.h rename to SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Headers/CarnivalLogger.h diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Headers/CarnivalMessage.h b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Headers/CarnivalMessage.h similarity index 100% rename from SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Headers/CarnivalMessage.h rename to SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Headers/CarnivalMessage.h diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Headers/CarnivalMessageStream.h b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Headers/CarnivalMessageStream.h similarity index 100% rename from SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Headers/CarnivalMessageStream.h rename to SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Headers/CarnivalMessageStream.h diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Info.plist b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Info.plist new file mode 100644 index 0000000..cdbee80 Binary files /dev/null and b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Info.plist differ diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Modules/module.modulemap b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Modules/module.modulemap new file mode 100644 index 0000000..d234d9b --- /dev/null +++ b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Modules/module.modulemap @@ -0,0 +1,6 @@ +framework module Carnival { + umbrella header "Carnival-umbrella.h" + + export * + module * { export * } +} diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Resources b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Resources deleted file mode 120000 index 953ee36..0000000 --- a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Resources +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Resources \ No newline at end of file diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Carnival b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Carnival deleted file mode 100644 index 6a80b15..0000000 Binary files a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Carnival and /dev/null differ diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/Info.plist b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/Info.plist deleted file mode 100644 index d517c0f..0000000 Binary files a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/Info.plist and /dev/null differ diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/en.lproj/InfoPlist.strings b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/en.lproj/InfoPlist.strings deleted file mode 100644 index 3967e06..0000000 Binary files a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/en.lproj/InfoPlist.strings and /dev/null differ diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/load_failure.html b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/load_failure.html deleted file mode 100644 index 95d00ac..0000000 --- a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/load_failure.html +++ /dev/null @@ -1,79 +0,0 @@ - - - - - Error! - - - - - -
-
-

Whoops

-

- Something went wrong and we
couldn't load the page you
requested. -

-
- - refresh - -

Try Again

-
-
- - \ No newline at end of file diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/Info.plist b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/Info.plist deleted file mode 100644 index c53ee7f..0000000 Binary files a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/Info.plist and /dev/null differ diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/Current b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/Current deleted file mode 120000 index 8c7e5a6..0000000 --- a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/Current +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_close_button@2x.png b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_close_button@2x.png similarity index 100% rename from SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_close_button@2x.png rename to SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_close_button@2x.png diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_close_button_white@2x.png b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_close_button_white@2x.png similarity index 100% rename from SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_close_button_white@2x.png rename to SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_close_button_white@2x.png diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_message_close_button@2x.png b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_message_close_button@2x.png similarity index 100% rename from SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_message_close_button@2x.png rename to SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_message_close_button@2x.png diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_refresh.png b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_refresh.png similarity index 100% rename from SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_refresh.png rename to SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_refresh.png diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7@2x~ipad.png b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_safari-7@2x~ipad.png similarity index 100% rename from SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7@2x~ipad.png rename to SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_safari-7@2x~ipad.png diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7@2x~iphone.png b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_safari-7@2x~iphone.png similarity index 100% rename from SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7@2x~iphone.png rename to SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_safari-7@2x~iphone.png diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7@3x~iphone.png b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_safari-7@3x~iphone.png similarity index 100% rename from SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7@3x~iphone.png rename to SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_safari-7@3x~iphone.png diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7~ipad.png b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_safari-7~ipad.png similarity index 100% rename from SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7~ipad.png rename to SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_safari-7~ipad.png diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7~iphone.png b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_safari-7~iphone.png similarity index 100% rename from SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari-7~iphone.png rename to SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_safari-7~iphone.png diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari@2x~ipad.png b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_safari@2x~ipad.png similarity index 100% rename from SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari@2x~ipad.png rename to SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_safari@2x~ipad.png diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari@2x~iphone.png b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_safari@2x~iphone.png similarity index 100% rename from SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari@2x~iphone.png rename to SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_safari@2x~iphone.png diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari@3x~iphone.png b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_safari@3x~iphone.png similarity index 100% rename from SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari@3x~iphone.png rename to SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_safari@3x~iphone.png diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari~ipad.png b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_safari~ipad.png similarity index 100% rename from SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari~ipad.png rename to SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_safari~ipad.png diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari~iphone.png b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_safari~iphone.png similarity index 100% rename from SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_safari~iphone.png rename to SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_safari~iphone.png diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_share_button_white@2x.png b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_share_button_white@2x.png similarity index 100% rename from SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_share_button_white@2x.png rename to SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_share_button_white@2x.png diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_stream_back_button@2x.png b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_stream_back_button@2x.png similarity index 100% rename from SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_stream_back_button@2x.png rename to SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_stream_back_button@2x.png diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_stream_back_button_white@2x.png b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_stream_back_button_white@2x.png similarity index 100% rename from SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/Versions/A/Resources/CarnivalResources.bundle/cp_stream_back_button_white@2x.png rename to SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Carnival.framework/cp_stream_back_button_white@2x.png diff --git a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Resources/CarnivalResources.bundle b/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Resources/CarnivalResources.bundle deleted file mode 120000 index 2a16abf..0000000 --- a/SwiftExampleProject/SwiftExampleProject/Vendor/Carnival/Resources/CarnivalResources.bundle +++ /dev/null @@ -1 +0,0 @@ -../Carnival.framework/Resources/CarnivalResources.bundle \ No newline at end of file