Skip to content

Commit 97a8f06

Browse files
javisanespjavisanesp
committed
Merge branch 'release/3.0.2-15'
2 parents b456c01 + 048c31c commit 97a8f06

File tree

118 files changed

+2409
-1031
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+2409
-1031
lines changed

‎.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,6 @@
2828
[submodule "iMEGA/Vendor/AMLocalizedString"]
2929
path = iMEGA/Vendor/AMLocalizedString
3030
url = https://github.com/tagyro/AMLocalizedString.git
31+
[submodule "iMEGA/Vendor/CTAssetsPickerController"]
32+
path = iMEGA/Vendor/CTAssetsPickerController
33+
url = https://github.com/meganz/CTAssetsPickerController.git

‎Crashlytics.framework/Crashlytics

132 KB
Binary file not shown.

‎Crashlytics.framework/Headers/ANSCompatibility.h

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
//
2+
// ANSCompatibility.h
3+
// AnswersKit
4+
//
5+
// Copyright (c) 2015 Crashlytics, Inc. All rights reserved.
6+
//
7+
8+
#pragma once
9+
10+
#if !__has_feature(nullability)
11+
#define nonnull
12+
#define nullable
13+
#define _Nullable
14+
#define _Nonnull
15+
#endif
16+
17+
#ifndef NS_ASSUME_NONNULL_BEGIN
18+
#define NS_ASSUME_NONNULL_BEGIN
19+
#endif
20+
21+
#ifndef NS_ASSUME_NONNULL_END
22+
#define NS_ASSUME_NONNULL_END
23+
#endif
24+
25+
#if __has_feature(objc_generics)
26+
#define ANS_GENERIC_NSARRAY(type) NSArray<type>
27+
#define ANS_GENERIC_NSDICTIONARY(key_type,object_key) NSDictionary<key_type, object_key>
28+
#else
29+
#define ANS_GENERIC_NSARRAY(type) NSArray
30+
#define ANS_GENERIC_NSDICTIONARY(key_type,object_key) NSDictionary
31+
#endif

‎Crashlytics.framework/Headers/Answers.h

+14-14
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77

88
#import <Foundation/Foundation.h>
9-
#import "CLSAttributes.h"
9+
#import "ANSCompatibility.h"
1010

1111
NS_ASSUME_NONNULL_BEGIN
1212

@@ -22,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
2222
*/
2323
+ (void)logSignUpWithMethod:(nullable NSString *)signUpMethodOrNil
2424
success:(nullable NSNumber *)signUpSucceededOrNil
25-
customAttributes:(nullable CLS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
25+
customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
2626

2727
/**
2828
* Log an Log In event to see users logging into your app in real-time, understand how many
@@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
3434
*/
3535
+ (void)logLoginWithMethod:(nullable NSString *)loginMethodOrNil
3636
success:(nullable NSNumber *)loginSucceededOrNil
37-
customAttributes:(nullable CLS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
37+
customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
3838

3939
/**
4040
* Log a Share event to see users sharing from your app in real-time, letting you
@@ -50,7 +50,7 @@ NS_ASSUME_NONNULL_BEGIN
5050
contentName:(nullable NSString *)contentNameOrNil
5151
contentType:(nullable NSString *)contentTypeOrNil
5252
contentId:(nullable NSString *)contentIdOrNil
53-
customAttributes:(nullable CLS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
53+
customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
5454

5555
/**
5656
* Log an Invite Event to track how users are inviting other users into
@@ -60,7 +60,7 @@ NS_ASSUME_NONNULL_BEGIN
6060
* @param customAttributesOrNil A dictionary of custom attributes to associate with this purchase.
6161
*/
6262
+ (void)logInviteWithMethod:(nullable NSString *)inviteMethodOrNil
63-
customAttributes:(nullable CLS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
63+
customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
6464

6565
/**
6666
* Log a Purchase event to see your revenue in real-time, understand how many users are making purchases, see which
@@ -80,7 +80,7 @@ NS_ASSUME_NONNULL_BEGIN
8080
itemName:(nullable NSString *)itemNameOrNil
8181
itemType:(nullable NSString *)itemTypeOrNil
8282
itemId:(nullable NSString *)itemIdOrNil
83-
customAttributes:(nullable CLS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
83+
customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
8484

8585
/**
8686
* Log a Level Start Event to track where users are in your game.
@@ -89,7 +89,7 @@ NS_ASSUME_NONNULL_BEGIN
8989
* @param customAttributesOrNil A dictionary of custom attributes to associate with this level start event.
9090
*/
9191
+ (void)logLevelStart:(nullable NSString *)levelNameOrNil
92-
customAttributes:(nullable CLS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
92+
customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
9393

9494
/**
9595
* Log a Level End event to track how users are completing levels in your game.
@@ -102,7 +102,7 @@ NS_ASSUME_NONNULL_BEGIN
102102
+ (void)logLevelEnd:(nullable NSString *)levelNameOrNil
103103
score:(nullable NSNumber *)scoreOrNil
104104
success:(nullable NSNumber *)levelCompletedSuccesfullyOrNil
105-
customAttributes:(nullable CLS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
105+
customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
106106

107107
/**
108108
* Log an Add to Cart event to see users adding items to a shopping cart in real-time, understand how
@@ -121,7 +121,7 @@ NS_ASSUME_NONNULL_BEGIN
121121
itemName:(nullable NSString *)itemNameOrNil
122122
itemType:(nullable NSString *)itemTypeOrNil
123123
itemId:(nullable NSString *)itemIdOrNil
124-
customAttributes:(nullable CLS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
124+
customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
125125

126126
/**
127127
* Log a Start Checkout event to see users moving through the purchase funnel in real-time, understand how many
@@ -136,7 +136,7 @@ NS_ASSUME_NONNULL_BEGIN
136136
+ (void)logStartCheckoutWithPrice:(nullable NSDecimalNumber *)totalPriceOrNil
137137
currency:(nullable NSString *)currencyOrNil
138138
itemCount:(nullable NSNumber *)itemCountOrNil
139-
customAttributes:(nullable CLS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
139+
customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
140140

141141
/**
142142
* Log a Rating event to see users rating content within your app in real-time and understand what
@@ -152,7 +152,7 @@ NS_ASSUME_NONNULL_BEGIN
152152
contentName:(nullable NSString *)contentNameOrNil
153153
contentType:(nullable NSString *)contentTypeOrNil
154154
contentId:(nullable NSString *)contentIdOrNil
155-
customAttributes:(nullable CLS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
155+
customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
156156

157157
/**
158158
* Log a Content View event to see users viewing content within your app in real-time and
@@ -166,7 +166,7 @@ NS_ASSUME_NONNULL_BEGIN
166166
+ (void)logContentViewWithName:(nullable NSString *)contentNameOrNil
167167
contentType:(nullable NSString *)contentTypeOrNil
168168
contentId:(nullable NSString *)contentIdOrNil
169-
customAttributes:(nullable CLS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
169+
customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
170170

171171
/**
172172
* Log a Search event allows you to see users searching within your app in real-time and understand
@@ -176,7 +176,7 @@ NS_ASSUME_NONNULL_BEGIN
176176
* @param customAttributesOrNil A dictionary of custom attributes to associate with this event.
177177
*/
178178
+ (void)logSearchWithQuery:(nullable NSString *)queryOrNil
179-
customAttributes:(nullable CLS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
179+
customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
180180

181181
/**
182182
* Log a Custom Event to see user actions that are uniquely important for your app in real-time, to see how often
@@ -199,7 +199,7 @@ NS_ASSUME_NONNULL_BEGIN
199199
* engagement.
200200
*/
201201
+ (void)logCustomEventWithName:(NSString *)eventName
202-
customAttributes:(nullable CLS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
202+
customAttributes:(nullable ANS_GENERIC_NSDICTIONARY(NSString *, id) *)customAttributesOrNil;
203203

204204
@end
205205

‎Crashlytics.framework/Info.plist

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
<key>CFBundlePackageType</key>
1818
<string>FMWK</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>3.3.1</string>
20+
<string>3.3.4</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleSupportedPlatforms</key>
2424
<array>
2525
<string>iPhoneOS</string>
2626
</array>
2727
<key>CFBundleVersion</key>
28-
<string>79</string>
28+
<string>82</string>
2929
<key>DTCompiler</key>
3030
<string>com.apple.compilers.llvm.clang.1_0</string>
3131
<key>DTPlatformBuild</key>
@@ -41,7 +41,7 @@
4141
<key>DTXcode</key>
4242
<string>0700</string>
4343
<key>DTXcodeBuild</key>
44-
<string>7A218</string>
44+
<string>7A220</string>
4545
<key>MinimumOSVersion</key>
4646
<string>6.0</string>
4747
<key>NSHumanReadableCopyright</key>

‎Crashlytics.framework/Modules/module.modulemap

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
framework module Crashlytics {
22
header "Crashlytics.h"
33
header "Answers.h"
4+
header "ANSCompatibility.h"
45
header "CLSLogging.h"
56
header "CLSReport.h"
67
header "CLSStackFrame.h"

‎Crashlytics.framework/run

-142 KB
Binary file not shown.

‎Crashlytics.framework/submit

16 Bytes
Binary file not shown.

‎Crashlytics.framework/uploadDSYM

595 KB
Binary file not shown.

‎Fabric.framework/Fabric

5.92 KB
Binary file not shown.

‎Fabric.framework/Headers/FABAttributes.h

-5
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,13 @@
22
// FABAttributes.h
33
// Fabric
44
//
5-
// Created by Priyanka Joshi on 3/3/15.
65
// Copyright (c) 2015 Twitter. All rights reserved.
76
//
87

98
#pragma once
109

1110
#define FAB_UNAVAILABLE(x) __attribute__((unavailable(x)))
1211

13-
#ifndef TARGET_OS_IOS
14-
#define TARGET_OS_IOS TARGET_OS_IPHONE
15-
#endif
16-
1712
#if __has_feature(nullability)
1813
#define fab_nullable nullable
1914
#define fab_nonnull nonnull

‎Fabric.framework/Headers/Fabric.h

+10
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,16 @@
99

1010
NS_ASSUME_NONNULL_BEGIN
1111

12+
#if TARGET_OS_IPHONE
13+
#if __IPHONE_OS_VERSION_MIN_REQUIRED < 60000
14+
#error "Fabric's minimum iOS version is 6.0"
15+
#endif
16+
#else
17+
#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
18+
#error "Fabric's minimum OS X version is 10.7"
19+
#endif
20+
#endif
21+
1222
/**
1323
* Fabric Base. Coordinates configuration and starts all provided kits.
1424
*/

‎Fabric.framework/Info.plist

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
<key>CFBundlePackageType</key>
1818
<string>FMWK</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.5.1</string>
20+
<string>1.5.5</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleSupportedPlatforms</key>
2424
<array>
2525
<string>iPhoneOS</string>
2626
</array>
2727
<key>CFBundleVersion</key>
28-
<string>25</string>
28+
<string>30</string>
2929
<key>DTCompiler</key>
3030
<string>com.apple.compilers.llvm.clang.1_0</string>
3131
<key>DTPlatformBuild</key>
@@ -41,7 +41,7 @@
4141
<key>DTXcode</key>
4242
<string>0700</string>
4343
<key>DTXcodeBuild</key>
44-
<string>7A218</string>
44+
<string>7A220</string>
4545
<key>MinimumOSVersion</key>
4646
<string>6.0</string>
4747
<key>NSHumanReadableCopyright</key>

‎Fabric.framework/run

-142 KB
Binary file not shown.

‎Fabric.framework/uploadDSYM

595 KB
Binary file not shown.

0 commit comments

Comments
 (0)