diff --git a/Assets/Plugins/Android/appboy-ui.aar b/Assets/Plugins/Android/appboy-ui.aar index e85e7effb..7d223eb05 100644 Binary files a/Assets/Plugins/Android/appboy-ui.aar and b/Assets/Plugins/Android/appboy-ui.aar differ diff --git a/Assets/Plugins/Android/appboy-ui.aar.meta b/Assets/Plugins/Android/appboy-ui.aar.meta index e78dcc07a..19b70046d 100644 --- a/Assets/Plugins/Android/appboy-ui.aar.meta +++ b/Assets/Plugins/Android/appboy-ui.aar.meta @@ -11,22 +11,10 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux64: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 1 - first: Android: Android second: - enabled: 0 + enabled: 1 settings: CPU: ARMv7 - first: @@ -42,51 +30,6 @@ PluginImporter: CPU: AnyCPU DefaultValueInitialized: true OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 0 - settings: - AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Android/appboy-unity.aar b/Assets/Plugins/Android/appboy-unity.aar index 6831f0f6c..2285f2c23 100644 Binary files a/Assets/Plugins/Android/appboy-unity.aar and b/Assets/Plugins/Android/appboy-unity.aar differ diff --git a/Assets/Plugins/Android/appboy-unity.aar.meta b/Assets/Plugins/Android/appboy-unity.aar.meta index 633ff5c82..3835c2f47 100644 --- a/Assets/Plugins/Android/appboy-unity.aar.meta +++ b/Assets/Plugins/Android/appboy-unity.aar.meta @@ -11,22 +11,10 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux64: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 1 - first: Android: Android second: - enabled: 0 + enabled: 1 settings: CPU: ARMv7 - first: @@ -41,52 +29,7 @@ PluginImporter: settings: CPU: AnyCPU DefaultValueInitialized: true - OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 0 - settings: - AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: - FrameworkDependencies: + OS: AnyOS userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/Android/appboy.aar b/Assets/Plugins/Android/appboy.aar index dc52b354b..7474dd264 100644 Binary files a/Assets/Plugins/Android/appboy.aar and b/Assets/Plugins/Android/appboy.aar differ diff --git a/Assets/Plugins/Android/appboy.aar.meta b/Assets/Plugins/Android/appboy.aar.meta index c6ac2ec91..763a34095 100644 --- a/Assets/Plugins/Android/appboy.aar.meta +++ b/Assets/Plugins/Android/appboy.aar.meta @@ -11,22 +11,10 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: - - first: - '': Any - second: - enabled: 0 - settings: - Exclude Android: 1 - Exclude Editor: 1 - Exclude Linux64: 1 - Exclude OSXUniversal: 1 - Exclude Win: 1 - Exclude Win64: 1 - Exclude iOS: 1 - first: Android: Android second: - enabled: 0 + enabled: 1 settings: CPU: ARMv7 - first: @@ -42,51 +30,6 @@ PluginImporter: CPU: AnyCPU DefaultValueInitialized: true OS: AnyOS - - first: - Facebook: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Facebook: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 0 - settings: - AddToEmbeddedBinaries: false - CPU: AnyCPU - CompileFlags: - FrameworkDependencies: userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/iOS/AppboyUnityManager.mm b/Assets/Plugins/iOS/AppboyUnityManager.mm index 259d14872..d1a5d575d 100644 --- a/Assets/Plugins/iOS/AppboyUnityManager.mm +++ b/Assets/Plugins/iOS/AppboyUnityManager.mm @@ -286,7 +286,6 @@ - (void) registerForRemoteNotifications { } [center requestAuthorizationWithOptions:options completionHandler:^(BOOL granted, NSError *_Nullable error) { - NSLog(@"pushAuthorizationFromUserNotificationCenter permission granted."); [[Appboy sharedInstance] pushAuthorizationFromUserNotificationCenter:granted]; }]; [[UIApplication sharedApplication] registerForRemoteNotifications]; diff --git a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKContentCardsStoryboard.storyboardc/ABKContentCardsTableViewController.nib/objects-11.0+.nib b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKContentCardsStoryboard.storyboardc/ABKContentCardsTableViewController.nib/objects-11.0+.nib index eaa02d100..8c6e994df 100644 Binary files a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKContentCardsStoryboard.storyboardc/ABKContentCardsTableViewController.nib/objects-11.0+.nib and b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKContentCardsStoryboard.storyboardc/ABKContentCardsTableViewController.nib/objects-11.0+.nib differ diff --git a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKContentCardsStoryboard.storyboardc/ABKContentCardsTableViewController.nib/runtime.nib b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKContentCardsStoryboard.storyboardc/ABKContentCardsTableViewController.nib/runtime.nib index 31da047fd..89848e754 100644 Binary files a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKContentCardsStoryboard.storyboardc/ABKContentCardsTableViewController.nib/runtime.nib and b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKContentCardsStoryboard.storyboardc/ABKContentCardsTableViewController.nib/runtime.nib differ diff --git a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKContentCardsStoryboard.storyboardc/ABKContentCardsViewController.nib/objects-11.0+.nib b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKContentCardsStoryboard.storyboardc/ABKContentCardsViewController.nib/objects-11.0+.nib index 7aa5f1dfe..f29e8cbd3 100644 Binary files a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKContentCardsStoryboard.storyboardc/ABKContentCardsViewController.nib/objects-11.0+.nib and b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKContentCardsStoryboard.storyboardc/ABKContentCardsViewController.nib/objects-11.0+.nib differ diff --git a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKContentCardsStoryboard.storyboardc/ABKContentCardsViewController.nib/runtime.nib b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKContentCardsStoryboard.storyboardc/ABKContentCardsViewController.nib/runtime.nib index b4520ea5b..d19500dcd 100644 Binary files a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKContentCardsStoryboard.storyboardc/ABKContentCardsViewController.nib/runtime.nib and b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKContentCardsStoryboard.storyboardc/ABKContentCardsViewController.nib/runtime.nib differ diff --git a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKContentCardsStoryboard.storyboardc/pNw-1d-kzS-view-QfY-bo-EsO.nib/objects-11.0+.nib b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKContentCardsStoryboard.storyboardc/pNw-1d-kzS-view-QfY-bo-EsO.nib/objects-11.0+.nib index aecff4a00..7988e5a1e 100644 Binary files a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKContentCardsStoryboard.storyboardc/pNw-1d-kzS-view-QfY-bo-EsO.nib/objects-11.0+.nib and b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKContentCardsStoryboard.storyboardc/pNw-1d-kzS-view-QfY-bo-EsO.nib/objects-11.0+.nib differ diff --git a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKContentCardsStoryboard.storyboardc/pNw-1d-kzS-view-QfY-bo-EsO.nib/runtime.nib b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKContentCardsStoryboard.storyboardc/pNw-1d-kzS-view-QfY-bo-EsO.nib/runtime.nib index 0480e80ff..dfa89cd1d 100644 Binary files a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKContentCardsStoryboard.storyboardc/pNw-1d-kzS-view-QfY-bo-EsO.nib/runtime.nib and b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKContentCardsStoryboard.storyboardc/pNw-1d-kzS-view-QfY-bo-EsO.nib/runtime.nib differ diff --git a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKInAppMessageFullViewController.nib/objects-11.0+.nib b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKInAppMessageFullViewController.nib/objects-11.0+.nib index 215bac706..e5f7b5a8a 100644 Binary files a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKInAppMessageFullViewController.nib/objects-11.0+.nib and b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKInAppMessageFullViewController.nib/objects-11.0+.nib differ diff --git a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKInAppMessageFullViewController.nib/runtime.nib b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKInAppMessageFullViewController.nib/runtime.nib index aff00910b..0051f76d2 100644 Binary files a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKInAppMessageFullViewController.nib/runtime.nib and b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKInAppMessageFullViewController.nib/runtime.nib differ diff --git a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKInAppMessageModalViewController.nib b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKInAppMessageModalViewController.nib index daf091a4d..b24a1f5a5 100644 Binary files a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKInAppMessageModalViewController.nib and b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKInAppMessageModalViewController.nib differ diff --git a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKInAppMessageSlideupViewController.nib b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKInAppMessageSlideupViewController.nib index 6c95808e6..dc4ddb2ac 100644 Binary files a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKInAppMessageSlideupViewController.nib and b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKInAppMessageSlideupViewController.nib differ diff --git a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKNewsFeedCardStoryboard.storyboardc/ABKNewsFeedTableViewController.nib b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKNewsFeedCardStoryboard.storyboardc/ABKNewsFeedTableViewController.nib index a08c5c492..3c95702f5 100644 Binary files a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKNewsFeedCardStoryboard.storyboardc/ABKNewsFeedTableViewController.nib and b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKNewsFeedCardStoryboard.storyboardc/ABKNewsFeedTableViewController.nib differ diff --git a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKNewsFeedCardStoryboard.storyboardc/ABKNewsFeedViewController.nib b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKNewsFeedCardStoryboard.storyboardc/ABKNewsFeedViewController.nib index 62da45994..92075c441 100644 Binary files a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKNewsFeedCardStoryboard.storyboardc/ABKNewsFeedViewController.nib and b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKNewsFeedCardStoryboard.storyboardc/ABKNewsFeedViewController.nib differ diff --git a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKNewsFeedCardStoryboard.storyboardc/pNw-1d-kzS-view-QfY-bo-EsO.nib b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKNewsFeedCardStoryboard.storyboardc/pNw-1d-kzS-view-QfY-bo-EsO.nib index 8133e0ab1..bf9be91c2 100644 Binary files a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKNewsFeedCardStoryboard.storyboardc/pNw-1d-kzS-view-QfY-bo-EsO.nib and b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/ABKNewsFeedCardStoryboard.storyboardc/pNw-1d-kzS-view-QfY-bo-EsO.nib differ diff --git a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/Appboy.bundle/Info.plist b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/Appboy.bundle/Info.plist index c48137e3e..dbcb3c9ca 100644 Binary files a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/Appboy.bundle/Info.plist and b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/Appboy.bundle/Info.plist differ diff --git a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/Appboy_iOS_SDK b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/Appboy_iOS_SDK index 1a16284ac..ba5467054 100755 Binary files a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/Appboy_iOS_SDK and b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/Appboy_iOS_SDK differ diff --git a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/Headers/ABKUIUtils.h b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/Headers/ABKUIUtils.h index a600600be..5a62328c7 100644 --- a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/Headers/ABKUIUtils.h +++ b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/Headers/ABKUIUtils.h @@ -28,6 +28,11 @@ */ @property (class, readonly) UIStatusBarStyle applicationStatusBarStyle; +/*! + * Given a class, this method searches across multiple locations and returns the associated bundle for that class + */ ++ (NSBundle *)bundle:(Class)bundleClass; + + (NSString *)getLocalizedString:(NSString *)key inAppboyBundle:(NSBundle *)appboyBundle table:(NSString *)table; + (BOOL)objectIsValidAndNotEmpty:(id)object; + (Class)getSDWebImageProxyClass; diff --git a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/Headers/ABKURLDelegate.h b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/Headers/ABKURLDelegate.h index e12f97271..ad5564e21 100644 --- a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/Headers/ABKURLDelegate.h +++ b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/Headers/ABKURLDelegate.h @@ -34,7 +34,9 @@ typedef NS_ENUM(NSInteger, ABKChannel) { * This delegate method is fired whenever the user attempts to open a URL sent by Braze. You can use this delegate * to customize Braze's URL handling. */ -- (BOOL)handleAppboyURL:(NSURL *)url fromChannel:(ABKChannel)channel withExtras:(NSDictionary *)extras; +- (BOOL)handleAppboyURL:(NSURL * _Nullable)url + fromChannel:(ABKChannel)channel + withExtras:(NSDictionary * _Nullable)extras; @end NS_ASSUME_NONNULL_END diff --git a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/Headers/Appboy.h b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/Headers/Appboy.h index f8edeb306..030ee7f40 100644 --- a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/Headers/Appboy.h +++ b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/Headers/Appboy.h @@ -13,7 +13,7 @@ #import #ifndef APPBOY_SDK_VERSION -#define APPBOY_SDK_VERSION @"3.27.0" +#define APPBOY_SDK_VERSION @"3.29.1" #endif #if !TARGET_OS_TV @@ -491,21 +491,6 @@ typedef NS_OPTIONS(NSUInteger, ABKDeviceOptions) { #if !TARGET_OS_TV -/*! - * @param response The response passed in from userNotificationCenter:didReceiveNotificationResponse:withCompletionHandler:. - * - * @discussion This method returns whether or not a UNNotification was sent from Braze servers. - */ -- (BOOL)userNotificationWasSentFromAppboy:(UNNotificationResponse *)response __deprecated_msg("Use [ABKPushUtils isAppboyUserNotification:] instead.") NS_AVAILABLE_IOS(10.0); - -/*! - * @param options The NSDictionary you get from application:didFinishLaunchingWithOptions or - * application:didReceiveRemoteNotification in your App Delegate. - * - * @discussion - * Test a push notification to see if it came Braze. - */ -- (BOOL)pushNotificationWasSentFromAppboy:(NSDictionary *)options __deprecated_msg("Use [ABKPushUtils isAppboyRemoteNotification:] instead."); /*! * @param deviceToken The device's push token. diff --git a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/Info.plist b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/Info.plist index 9631ce3a0..2936a6640 100644 Binary files a/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/Info.plist and b/Assets/Plugins/iOS/Appboy_iOS_SDK.framework/Info.plist differ diff --git a/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDImageAWebPCoder.h b/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDImageAWebPCoder.h new file mode 100644 index 000000000..4b585a992 --- /dev/null +++ b/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDImageAWebPCoder.h @@ -0,0 +1,23 @@ +/* + * This file is part of the SDWebImage package. + * (c) Olivier Poitrey + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +#import +#import "SDImageIOAnimatedCoder.h" + +/** + This coder is used for Google WebP and Animated WebP(AWebP) image format. + Image/IO provide the WebP decoding support in iOS 14/macOS 11/tvOS 14/watchOS 7+. + @note Currently Image/IO seems does not supports WebP encoding, if you need WebP encoding, use the custom codec below. + @note If you need to support lower firmware version for WebP, you can have a try at https://github.com/SDWebImage/SDWebImageWebPCoder + */ +API_AVAILABLE(ios(14.0), tvos(14.0), macos(11.0), watchos(7.0)) +@interface SDImageAWebPCoder : SDImageIOAnimatedCoder + +@property (nonatomic, class, readonly, nonnull) SDImageAWebPCoder *sharedCoder; + +@end diff --git a/Assets/Plugins/iOS/SDWebImage.framework/PrivateHeaders/SDImageHEICCoderInternal.h.meta b/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDImageAWebPCoder.h.meta similarity index 74% rename from Assets/Plugins/iOS/SDWebImage.framework/PrivateHeaders/SDImageHEICCoderInternal.h.meta rename to Assets/Plugins/iOS/SDWebImage.framework/Headers/SDImageAWebPCoder.h.meta index 6ca594b10..c5111dada 100644 --- a/Assets/Plugins/iOS/SDWebImage.framework/PrivateHeaders/SDImageHEICCoderInternal.h.meta +++ b/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDImageAWebPCoder.h.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1160bec5585f441e8a2a4ed679a079ca +guid: 59aa853882a714ef89d94b7dfdd61cb9 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDImageCache.h b/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDImageCache.h index 6f1d13063..7523da416 100644 --- a/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDImageCache.h +++ b/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDImageCache.h @@ -103,8 +103,18 @@ typedef NS_OPTIONS(NSUInteger, SDImageCacheOptions) { */ @property (nonatomic, class, readonly, nonnull) SDImageCache *sharedImageCache; +/** + * Control the default disk cache directory. This will effect all the SDImageCache instance created after modification, even for shared image cache. + * This can be used to share the same disk cache with the App and App Extension (Today/Notification Widget) using `- [NSFileManager.containerURLForSecurityApplicationGroupIdentifier:]`. + * @note If you pass nil, the value will be reset to `~/Library/Caches/com.hackemist.SDImageCache`. + * @note We still preserve the `namespace` arg, which means, if you change this property into `/path/to/use`, the `SDImageCache.sharedImageCache.diskCachePath` should be `/path/to/use/default` because shared image cache use `default` as namespace. + * Defaults to nil. + */ +@property (nonatomic, class, readwrite, null_resettable) NSString *defaultDiskCacheDirectory; + /** * Init a new cache store with a specific namespace + * The final disk cache directory should looks like ($directory/$namespace). And the default config of shared cache, should result in (~/Library/Caches/com.hackemist.SDImageCache/default/) * * @param ns The namespace to use for this cache store */ @@ -112,7 +122,7 @@ typedef NS_OPTIONS(NSUInteger, SDImageCacheOptions) { /** * Init a new cache store with a specific namespace and directory. - * If you don't provide the disk cache directory, we will use the User Cache directory with prefix (~/Library/Caches/com.hackemist.SDImageCache/). + * The final disk cache directory should looks like ($directory/$namespace). And the default config of shared cache, should result in (~/Library/Caches/com.hackemist.SDImageCache/default/) * * @param ns The namespace to use for this cache store * @param directory Directory to cache disk images in @@ -121,7 +131,7 @@ typedef NS_OPTIONS(NSUInteger, SDImageCacheOptions) { diskCacheDirectory:(nullable NSString *)directory; /** - * Init a new cache store with a specific namespace, directory and file manager + * Init a new cache store with a specific namespace, directory and config. * The final disk cache directory should looks like ($directory/$namespace). And the default config of shared cache, should result in (~/Library/Caches/com.hackemist.SDImageCache/default/) * * @param ns The namespace to use for this cache store diff --git a/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDImageCoderHelper.h b/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDImageCoderHelper.h index ebc720edb..77b9d779b 100644 --- a/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDImageCoderHelper.h +++ b/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDImageCoderHelper.h @@ -91,7 +91,8 @@ + (UIImage * _Nullable)decodedImageWithImage:(UIImage * _Nullable)image; /** - Return the decoded and probably scaled down image by the provided image. If the image is large than the limit size, will try to scale down. Or just works as `decodedImageWithImage:` + Return the decoded and probably scaled down image by the provided image. If the image pixels bytes size large than the limit bytes, will try to scale down. Or just works as `decodedImageWithImage:`, never scale up. + @warning You should not pass too small bytes, the suggestion value should be larger than 1MB. Even we use Tile Decoding to avoid OOM, however, small bytes will consume much more CPU time because we need to iterate more times to draw each tile. @param image The image to be decoded and scaled down @param bytes The limit bytes size. Provide 0 to use the build-in limit. @@ -101,7 +102,7 @@ /** Control the default limit bytes to scale down largest images. - This value must be larger than or equal to 1MB. Defaults to 60MB on iOS/tvOS, 90MB on macOS, 30MB on watchOS. + This value must be larger than 4 Bytes (at least 1x1 pixel). Defaults to 60MB on iOS/tvOS, 90MB on macOS, 30MB on watchOS. */ @property (class, readwrite) NSUInteger defaultScaleDownLimitBytes; diff --git a/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDImageHEICCoder.h b/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDImageHEICCoder.h index 3b6036d9f..f7dd6612f 100644 --- a/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDImageHEICCoder.h +++ b/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDImageHEICCoder.h @@ -17,6 +17,7 @@ @note This coder is not in the default coder list for now, since HEIC animated image is really rare, and Apple's implementation still contains performance issues. You can enable if you need this. @note If you need to support lower firmware version for HEIF, you can have a try at https://github.com/SDWebImage/SDWebImageHEIFCoder */ +API_AVAILABLE(ios(13.0), tvos(13.0), macos(10.15), watchos(6.0)) @interface SDImageHEICCoder : SDImageIOAnimatedCoder @property (nonatomic, class, readonly, nonnull) SDImageHEICCoder *sharedCoder; diff --git a/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDWebImage-umbrella.h b/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDWebImage-umbrella.h index fb94fa1e9..716e18364 100644 --- a/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDWebImage-umbrella.h +++ b/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDWebImage-umbrella.h @@ -21,6 +21,7 @@ #import "SDDiskCache.h" #import "SDGraphicsImageRenderer.h" #import "SDImageAPNGCoder.h" +#import "SDImageAWebPCoder.h" #import "SDImageCache.h" #import "SDImageCacheConfig.h" #import "SDImageCacheDefine.h" diff --git a/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDWebImage.h b/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDWebImage.h index 929f1b96f..0e568003f 100644 --- a/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDWebImage.h +++ b/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDWebImage.h @@ -70,6 +70,7 @@ FOUNDATION_EXPORT const unsigned char SDWebImageVersionString[]; #import #import #import +#import // Mac #if __has_include() diff --git a/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDWebImageDefine.h b/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDWebImageDefine.h index 90ee605f1..43df0464d 100644 --- a/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDWebImageDefine.h +++ b/Assets/Plugins/iOS/SDWebImage.framework/Headers/SDWebImageDefine.h @@ -160,7 +160,8 @@ typedef NS_OPTIONS(NSUInteger, SDWebImageOptions) { SDWebImageFromLoaderOnly = 1 << 16, /** - * By default, when you use `SDWebImageTransition` to do some view transition after the image load finished, this transition is only applied for image download from the network. This mask can force to apply view transition for memory and disk cache as well. + * By default, when you use `SDWebImageTransition` to do some view transition after the image load finished, this transition is only applied for image when the callback from manager is asynchronous (from network, or disk cache query) + * This mask can force to apply view transition for any cases, like memory cache query, or sync disk cache query. */ SDWebImageForceTransition = 1 << 17, @@ -200,7 +201,7 @@ typedef NS_OPTIONS(NSUInteger, SDWebImageOptions) { * We usually don't apply transform on vector images, because vector images supports dynamically changing to any size, rasterize to a fixed size will loss details. To modify vector images, you can process the vector data at runtime (such as modifying PDF tag / SVG element). * Use this flag to transform them anyway. */ - SDWebImageTransformVectorImage = 1 << 23, + SDWebImageTransformVectorImage = 1 << 23 }; diff --git a/Assets/Plugins/iOS/SDWebImage.framework/Info.plist b/Assets/Plugins/iOS/SDWebImage.framework/Info.plist index 36cca6383..26ce41720 100644 Binary files a/Assets/Plugins/iOS/SDWebImage.framework/Info.plist and b/Assets/Plugins/iOS/SDWebImage.framework/Info.plist differ diff --git a/Assets/Plugins/iOS/SDWebImage.framework/PrivateHeaders/SDImageHEICCoderInternal.h b/Assets/Plugins/iOS/SDWebImage.framework/PrivateHeaders/SDImageHEICCoderInternal.h deleted file mode 100644 index e7017bba6..000000000 --- a/Assets/Plugins/iOS/SDWebImage.framework/PrivateHeaders/SDImageHEICCoderInternal.h +++ /dev/null @@ -1,25 +0,0 @@ -/* -* This file is part of the SDWebImage package. -* (c) Olivier Poitrey -* -* For the full copyright and license information, please view the LICENSE -* file that was distributed with this source code. -*/ - -#import -#import "SDImageHEICCoder.h" - -// AVFileTypeHEIC/AVFileTypeHEIF is defined in AVFoundation via iOS 11, we use this without import AVFoundation -#define kSDUTTypeHEIC ((__bridge CFStringRef)@"public.heic") -#define kSDUTTypeHEIF ((__bridge CFStringRef)@"public.heif") -// HEIC Sequence (Animated Image) -#define kSDUTTypeHEICS ((__bridge CFStringRef)@"public.heics") - -@interface SDImageHEICCoder () - -+ (BOOL)canDecodeFromHEICFormat; -+ (BOOL)canDecodeFromHEIFFormat; -+ (BOOL)canEncodeToHEICFormat; -+ (BOOL)canEncodeToHEIFFormat; - -@end diff --git a/Assets/Plugins/iOS/SDWebImage.framework/PrivateHeaders/SDImageIOAnimatedCoderInternal.h b/Assets/Plugins/iOS/SDWebImage.framework/PrivateHeaders/SDImageIOAnimatedCoderInternal.h index cb4ee2c4c..022cf7dc7 100644 --- a/Assets/Plugins/iOS/SDWebImage.framework/PrivateHeaders/SDImageIOAnimatedCoderInternal.h +++ b/Assets/Plugins/iOS/SDWebImage.framework/PrivateHeaders/SDImageIOAnimatedCoderInternal.h @@ -9,10 +9,20 @@ #import #import "SDImageIOAnimatedCoder.h" +// AVFileTypeHEIC/AVFileTypeHEIF is defined in AVFoundation via iOS 11, we use this without import AVFoundation +#define kSDUTTypeHEIC ((__bridge CFStringRef)@"public.heic") +#define kSDUTTypeHEIF ((__bridge CFStringRef)@"public.heif") +// HEIC Sequence (Animated Image) +#define kSDUTTypeHEICS ((__bridge CFStringRef)@"public.heics") +// kUTTypeWebP seems not defined in public UTI framework, Apple use the hardcode string, we define them :) +#define kSDUTTypeWebP ((__bridge CFStringRef)@"org.webmproject.webp") + @interface SDImageIOAnimatedCoder () + (NSTimeInterval)frameDurationAtIndex:(NSUInteger)index source:(nonnull CGImageSourceRef)source; + (NSUInteger)imageLoopCountWithSource:(nonnull CGImageSourceRef)source; + (nullable UIImage *)createFrameAtIndex:(NSUInteger)index source:(nonnull CGImageSourceRef)source scale:(CGFloat)scale preserveAspectRatio:(BOOL)preserveAspectRatio thumbnailSize:(CGSize)thumbnailSize options:(nullable NSDictionary *)options; ++ (BOOL)canEncodeToFormat:(SDImageFormat)format; ++ (BOOL)canDecodeFromFormat:(SDImageFormat)format; @end diff --git a/Assets/Plugins/iOS/SDWebImage.framework/SDWebImage b/Assets/Plugins/iOS/SDWebImage.framework/SDWebImage index 0b42a8c86..82dc5004d 100755 Binary files a/Assets/Plugins/iOS/SDWebImage.framework/SDWebImage and b/Assets/Plugins/iOS/SDWebImage.framework/SDWebImage differ diff --git a/CHANGELOG.md b/CHANGELOG.md index 971bfef6f..abfd69d34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## 2.7.0 + +##### Breaking +- Updated the native iOS bridge to [Braze iOS SDK 3.29.1](https://github.com/Appboy/appboy-ios-sdk/releases/tag/3.29.1). +- Updated the Android plugin to use [Braze Android SDK 11.0.0](https://github.com/Appboy/appboy-android-sdk/blob/master/CHANGELOG.md#1100). + +##### Fixed +- Fixed a metadata issue for Android artifacts. + ## 2.6.0 ##### Breaking diff --git a/scripts/generate_package.sh b/scripts/generate_package.sh index 6c8086652..a5f6a9650 100755 --- a/scripts/generate_package.sh +++ b/scripts/generate_package.sh @@ -6,7 +6,7 @@ PROJECT_ROOT=$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd ) function unity_app_cmd { # Ask MacOS for the path of the currently running Unity process RUNNING_UNITY_APP="$(osascript -e 'tell application "System Events" to POSIX path of (file of process "Unity" as alias)')/Contents/MacOS/Unity" - UNITY_HUB_2018="/Applications/Unity/Hub/Editor/2018.3.10f1/Unity.app/Contents/MacOS/Unity" + UNITY_HUB="/Applications/Unity/Hub/Editor/2019.2.20f1/Unity.app/Contents/MacOS/Unity" UNITY_STANDALONE="/Applications/Unity/Unity.app/Contents/MacOS/Unity" if [ -f $RUNNING_UNITY_APP ] @@ -14,10 +14,10 @@ function unity_app_cmd { echo "Using Unity $RUNNING_UNITY_APP" $RUNNING_UNITY_APP "$@" - elif [ -f $UNITY_HUB_2018 ] + elif [ -f $UNITY_HUB ] then - echo "Using Unity $UNITY_HUB_2018" - $UNITY_HUB_2018 "$@" + echo "Using Unity $UNITY_HUB" + $UNITY_HUB "$@" else echo "Using Unity $UNITY_STANDALONE"