Skip to content

Commit 02877b8

Browse files
zapcannon87zapcannon87
authored
Merge pull request #644 from zapcannon87/master
release: 13.0.0-beta.3
2 parents dc6860e + 6727d53 commit 02877b8

32 files changed

+34
-717
lines changed

‎AVOS/AVOS.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
D30B6A7024A09D7B006ABE09 /* LCPaasClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C841A6E1A5A79FF00C5C6C4 /* LCPaasClient.h */; };
7676
D30B6A7124A09D7B006ABE09 /* LCPaasClient_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 83A2BD2E1CF33CDA0047B230 /* LCPaasClient_internal.h */; };
7777
D30B6A7224A09D7B006ABE09 /* LCPaasClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C841A6F1A5A79FF00C5C6C4 /* LCPaasClient.m */; };
78-
D30B6A7324A09D87006ABE09 /* LCRouter.h in Headers */ = {isa = PBXBuildFile; fileRef = 83F9A2C51CE014430002E21B /* LCRouter.h */; settings = {ATTRIBUTES = (Public, ); }; };
78+
D30B6A7324A09D87006ABE09 /* LCRouter.h in Headers */ = {isa = PBXBuildFile; fileRef = 83F9A2C51CE014430002E21B /* LCRouter.h */; };
7979
D30B6A7424A09D87006ABE09 /* LCRouter_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = D34EBDCC211C20FF0092A538 /* LCRouter_Internal.h */; };
8080
D30B6A7524A09D87006ABE09 /* LCRouter.m in Sources */ = {isa = PBXBuildFile; fileRef = 83F9A2C61CE014430002E21B /* LCRouter.m */; };
8181
D30B6A7624A09DA3006ABE09 /* LCSearchQuery.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C841A731A5A79FF00C5C6C4 /* LCSearchQuery.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -149,8 +149,7 @@
149149
D30B6AC024A09EBC006ABE09 /* LCIMClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C841BCC1A5A84C600C5C6C4 /* LCIMClient.h */; settings = {ATTRIBUTES = (Public, ); }; };
150150
D30B6AC124A09EBC006ABE09 /* LCIMClient_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C841BCB1A5A84C600C5C6C4 /* LCIMClient_Internal.h */; };
151151
D30B6AC224A09EBC006ABE09 /* LCIMClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C841BCD1A5A84C600C5C6C4 /* LCIMClient.m */; };
152-
D30B6AC324A09EBC006ABE09 /* LCIMClientInternalConversationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = D328B8E620FEE2200039091A /* LCIMClientInternalConversationManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
153-
D30B6AC424A09EBC006ABE09 /* LCIMClientInternalConversationManager_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = D3939CC620FEE621001C9F5C /* LCIMClientInternalConversationManager_Internal.h */; };
152+
D30B6AC324A09EBC006ABE09 /* LCIMClientInternalConversationManager.h in Headers */ = {isa = PBXBuildFile; fileRef = D328B8E620FEE2200039091A /* LCIMClientInternalConversationManager.h */; };
154153
D30B6AC524A09EBC006ABE09 /* LCIMClientInternalConversationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D328B8E720FEE2200039091A /* LCIMClientInternalConversationManager.m */; };
155154
D30B6AC624A09ED1006ABE09 /* LCIMConversation.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C841BD11A5A84C600C5C6C4 /* LCIMConversation.h */; settings = {ATTRIBUTES = (Public, ); }; };
156155
D30B6AC724A09ED1006ABE09 /* LCIMConversation_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C841BD01A5A84C600C5C6C4 /* LCIMConversation_Internal.h */; };
@@ -568,7 +567,6 @@
568567
D37EE4AE23ACF39700AACE99 /* LCNetworkReachabilityManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LCNetworkReachabilityManager.h; sourceTree = "<group>"; };
569568
D37EE4AF23ACF39700AACE99 /* LCNetworkReachabilityManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LCNetworkReachabilityManager.m; sourceTree = "<group>"; };
570569
D37EE4B023ACF39700AACE99 /* LCSecurityPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LCSecurityPolicy.h; sourceTree = "<group>"; };
571-
D3939CC620FEE621001C9F5C /* LCIMClientInternalConversationManager_Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LCIMClientInternalConversationManager_Internal.h; sourceTree = "<group>"; };
572570
D39724C324A5CD3C0099A518 /* RTMBaseTestCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RTMBaseTestCase.swift; sourceTree = "<group>"; };
573571
D39724C524A852400099A518 /* IMClientTestCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IMClientTestCase.swift; sourceTree = "<group>"; };
574572
D3A397F024A5A4670087D6F8 /* RTMConnectionTestCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RTMConnectionTestCase.swift; sourceTree = "<group>"; };
@@ -1241,7 +1239,6 @@
12411239
8C841BCB1A5A84C600C5C6C4 /* LCIMClient_Internal.h */,
12421240
8C841BCD1A5A84C600C5C6C4 /* LCIMClient.m */,
12431241
D328B8E620FEE2200039091A /* LCIMClientInternalConversationManager.h */,
1244-
D3939CC620FEE621001C9F5C /* LCIMClientInternalConversationManager_Internal.h */,
12451242
D328B8E720FEE2200039091A /* LCIMClientInternalConversationManager.m */,
12461243
);
12471244
path = Client;
@@ -1479,7 +1476,6 @@
14791476
D30B6A5724A09D23006ABE09 /* LCRelation.h in Headers */,
14801477
D30B6B3E24A09F79006ABE09 /* LCIMConversationQueryCacheStore.h in Headers */,
14811478
D30B6AA024A09E35006ABE09 /* LCHelpers.h in Headers */,
1482-
D30B6AC424A09EBC006ABE09 /* LCIMClientInternalConversationManager_Internal.h in Headers */,
14831479
D30B6AB324A09E35006ABE09 /* LCDynamicObject.h in Headers */,
14841480
D30B6B1824A09F28006ABE09 /* avmp.h in Headers */,
14851481
D30B6AA524A09E35006ABE09 /* LCDatabaseCommon.h in Headers */,

‎AVOS/LeanCloudObjc/AVOSCloud.h‎

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎AVOS/LeanCloudObjc/AVOSCloudIM.h‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎AVOS/LeanCloudObjc/AVOSCloudLiveQuery.h‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎AVOS/LeanCloudObjc/Foundation.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,3 @@
5858
// SMS & Captcha
5959
#import "LCCaptcha.h"
6060
#import "LCSMS.h"
61-
62-
// Router
63-
#import "LCRouter.h"

‎AVOS/LeanCloudObjc/Realtime.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
// Client
1717
#import "LCIMClientProtocol.h"
1818
#import "LCIMClient.h"
19-
#import "LCIMClientInternalConversationManager.h"
2019

2120
// Signature
2221
#import "LCIMSignature.h"

‎AVOS/Sources/Foundation/File/LCFile.h‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -337,21 +337,12 @@ typedef NS_OPTIONS(NSUInteger, LCFileDownloadOption) {
337337
*/
338338
+ (LCFileQuery *)query;
339339

340-
// MARK: - Deprecated
340+
// MARK: Compatibility
341341

342-
- (void)saveInBackgroundWithBlock:(void (^)(BOOL succeeded, NSError * _Nullable error))block
343-
__deprecated_msg("use -[uploadWithCompletionHandler:] instead.");
342+
- (void)saveInBackgroundWithBlock:(void (^)(BOOL succeeded, NSError * _Nullable error))block;
344343

345344
- (void)saveInBackgroundWithBlock:(void (^)(BOOL succeeded, NSError * _Nullable error))block
346-
progressBlock:(void (^ _Nullable)(NSInteger number))progressBlock
347-
__deprecated_msg("use -[uploadWithProgress:completionHandler:] instead.");
348-
349-
- (void)getDataInBackgroundWithBlock:(void (^)(NSData * _Nullable data, NSError * _Nullable error))block
350-
__deprecated_msg("use -[downloadWithCompletionHandler:] instead.");
351-
352-
- (void)getDataInBackgroundWithBlock:(void (^)(NSData * _Nullable data, NSError * _Nullable error))block
353-
progressBlock:(void (^ _Nullable)(NSInteger number))progressBlock
354-
__deprecated_msg("use -[downloadWithProgress:completionHandler:] instead.");
345+
progressBlock:(void (^ _Nullable)(NSInteger number))progressBlock;
355346

356347
@end
357348

‎AVOS/Sources/Foundation/File/LCFile.m‎

Lines changed: 1 addition & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1401,7 +1401,7 @@ + (NSDictionary *)decodingMetaDataFromDic:(NSDictionary *)dic
14011401
return value;
14021402
}
14031403

1404-
// MARK: - Deprecated
1404+
// MARK: Compatibility
14051405

14061406
- (void)saveInBackgroundWithBlock:(void (^)(BOOL, NSError * _Nullable))block
14071407
{
@@ -1414,59 +1414,6 @@ - (void)saveInBackgroundWithBlock:(void (^)(BOOL, NSError * _Nullable))block
14141414
[self uploadWithProgress:progressBlock completionHandler:block];
14151415
}
14161416

1417-
- (void)getDataInBackgroundWithBlock:(void (^)(NSData * _Nullable, NSError * _Nullable))block
1418-
{
1419-
[self downloadWithCompletionHandler:^(NSURL * _Nullable filePath, NSError * _Nullable error) {
1420-
1421-
if (error) {
1422-
1423-
block(nil, error);
1424-
1425-
return;
1426-
}
1427-
1428-
NSError *err = nil;
1429-
1430-
NSData *data = [NSData dataWithContentsOfURL:filePath options:NSDataReadingMappedIfSafe error:&err];
1431-
1432-
if (err) {
1433-
1434-
block(nil, err);
1435-
1436-
return;
1437-
}
1438-
1439-
block(data, nil);
1440-
}];
1441-
}
1442-
1443-
- (void)getDataInBackgroundWithBlock:(void (^)(NSData * _Nullable, NSError * _Nullable))block
1444-
progressBlock:(void (^)(NSInteger))progressBlock
1445-
{
1446-
[self downloadWithProgress:progressBlock completionHandler:^(NSURL * _Nullable filePath, NSError * _Nullable error) {
1447-
1448-
if (error) {
1449-
1450-
block(nil, error);
1451-
1452-
return;
1453-
}
1454-
1455-
NSError *err = nil;
1456-
1457-
NSData *data = [NSData dataWithContentsOfURL:filePath options:NSDataReadingMappedIfSafe error:&err];
1458-
1459-
if (err) {
1460-
1461-
block(nil, err);
1462-
1463-
return;
1464-
}
1465-
1466-
block(data, nil);
1467-
}];
1468-
}
1469-
14701417
@end
14711418

14721419
@implementation LCFileTokens

‎AVOS/Sources/Foundation/LCConstants.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,4 @@ typedef void (^LCProgressBlock)(NSInteger percentDone);
175175
typedef void (^LCFileResultBlock)(LCFile * _Nullable file, NSError * _Nullable error);
176176
typedef void (^LCDictionaryResultBlock)(NSDictionary * _Nullable dict, NSError * _Nullable error);
177177

178-
#define LC_DEPRECATED(explain) __attribute__((deprecated(explain)))
179-
180178
#define LC_WARN_UNUSED_RESULT __attribute__((warn_unused_result))

‎AVOS/Sources/Foundation/Object/LCObject.h‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -630,16 +630,4 @@ NS_ASSUME_NONNULL_BEGIN
630630

631631
@end
632632

633-
#pragma mark - Deprecated API
634-
635-
@interface LCObject (AVDeprecated)
636-
637-
+ (instancetype)objectWithoutDataWithObjectId:(NSString *)objectId LC_DEPRECATED("Deprecated in AVOSCloud SDK 3.2.9. Use +[LCObject objectWithObjectId:] instead.");
638-
639-
+ (instancetype)objectWithoutDataWithClassName:(NSString *)className objectId:(NSString *)objectId LC_DEPRECATED("Deprecated in AVOSCloud SDK 3.2.9. Use +[LCObject objectWithClassName:objectId:] instead.");
640-
641-
- (LCRelation *)relationforKey:(NSString *)key LC_DEPRECATED("Deprecated in AVOSCloud SDK 3.2.3. Use -[LCObject relationForKey:] instead.");
642-
643-
@end
644-
645633
NS_ASSUME_NONNULL_END

0 commit comments

Comments
 (0)