Skip to content

Commit 3bf60d0

Browse files
zapcannon87zapcannon87
authored
Merge pull request #663 from zapcannon87/develop
chore: vendor
2 parents 263f71e + b43a9b8 commit 3bf60d0

20 files changed

+34
-16
lines changed

‎AVOS/AVOS.xcodeproj/project.pbxproj‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -81,19 +81,19 @@
8181
D30B6A7924A09DA3006ABE09 /* LCSearchSortBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C841A761A5A79FF00C5C6C4 /* LCSearchSortBuilder.m */; };
8282
D30B6A7C24A09DBE006ABE09 /* LCStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C841A781A5A7A0000C5C6C4 /* LCStatus.h */; settings = {ATTRIBUTES = (Public, ); }; };
8383
D30B6A7D24A09DBF006ABE09 /* LCStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C841A791A5A7A0000C5C6C4 /* LCStatus.m */; };
84-
D30B6A7E24A09DCA006ABE09 /* LCCompatibilityMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4AC23ACF39700AACE99 /* LCCompatibilityMacros.h */; };
85-
D30B6A7F24A09DCA006ABE09 /* LCHTTPSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4AD23ACF39700AACE99 /* LCHTTPSessionManager.h */; };
84+
D30B6A7E24A09DCA006ABE09 /* LCCompatibilityMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4AC23ACF39700AACE99 /* LCCompatibilityMacros.h */; settings = {ATTRIBUTES = (Public, ); }; };
85+
D30B6A7F24A09DCA006ABE09 /* LCHTTPSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4AD23ACF39700AACE99 /* LCHTTPSessionManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
8686
D30B6A8024A09DCA006ABE09 /* LCHTTPSessionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D37EE4AA23ACF39700AACE99 /* LCHTTPSessionManager.m */; };
87-
D30B6A8124A09DCA006ABE09 /* LCNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4A923ACF39700AACE99 /* LCNetworking.h */; };
87+
D30B6A8124A09DCA006ABE09 /* LCNetworking.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4A923ACF39700AACE99 /* LCNetworking.h */; settings = {ATTRIBUTES = (Public, ); }; };
8888
D30B6A8224A09DCA006ABE09 /* LCNetworkReachabilityManager.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4AE23ACF39700AACE99 /* LCNetworkReachabilityManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
8989
D30B6A8324A09DCA006ABE09 /* LCNetworkReachabilityManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D37EE4AF23ACF39700AACE99 /* LCNetworkReachabilityManager.m */; };
90-
D30B6A8424A09DCA006ABE09 /* LCSecurityPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4B023ACF39700AACE99 /* LCSecurityPolicy.h */; };
90+
D30B6A8424A09DCA006ABE09 /* LCSecurityPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4B023ACF39700AACE99 /* LCSecurityPolicy.h */; settings = {ATTRIBUTES = (Public, ); }; };
9191
D30B6A8524A09DCA006ABE09 /* LCSecurityPolicy.m in Sources */ = {isa = PBXBuildFile; fileRef = D37EE4A323ACF39600AACE99 /* LCSecurityPolicy.m */; };
92-
D30B6A8624A09DCA006ABE09 /* LCURLRequestSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4A423ACF39600AACE99 /* LCURLRequestSerialization.h */; };
92+
D30B6A8624A09DCA006ABE09 /* LCURLRequestSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4A423ACF39600AACE99 /* LCURLRequestSerialization.h */; settings = {ATTRIBUTES = (Public, ); }; };
9393
D30B6A8724A09DCA006ABE09 /* LCURLRequestSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = D37EE4A623ACF39700AACE99 /* LCURLRequestSerialization.m */; };
94-
D30B6A8824A09DCA006ABE09 /* LCURLResponseSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4A523ACF39600AACE99 /* LCURLResponseSerialization.h */; };
94+
D30B6A8824A09DCA006ABE09 /* LCURLResponseSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4A523ACF39600AACE99 /* LCURLResponseSerialization.h */; settings = {ATTRIBUTES = (Public, ); }; };
9595
D30B6A8924A09DCA006ABE09 /* LCURLResponseSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = D37EE4A723ACF39700AACE99 /* LCURLResponseSerialization.m */; };
96-
D30B6A8A24A09DCA006ABE09 /* LCURLSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4A823ACF39700AACE99 /* LCURLSessionManager.h */; };
96+
D30B6A8A24A09DCA006ABE09 /* LCURLSessionManager.h in Headers */ = {isa = PBXBuildFile; fileRef = D37EE4A823ACF39700AACE99 /* LCURLSessionManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
9797
D30B6A8B24A09DCA006ABE09 /* LCURLSessionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D37EE4AB23ACF39700AACE99 /* LCURLSessionManager.m */; };
9898
D30B6A8C24A09DD8006ABE09 /* LCKeychain.h in Headers */ = {isa = PBXBuildFile; fileRef = 836705DC1BA1C1710050E968 /* LCKeychain.h */; };
9999
D30B6A8D24A09DD8006ABE09 /* LCKeychain.m in Sources */ = {isa = PBXBuildFile; fileRef = 836705DD1BA1C1710050E968 /* LCKeychain.m */; };
@@ -1013,7 +1013,6 @@
10131013
8C841A7A1A5A7A0000C5C6C4 /* Vendor */ = {
10141014
isa = PBXGroup;
10151015
children = (
1016-
83FCB9911CEDC57C007D8712 /* LCNetworking */,
10171016
836705DA1BA1C1710050E968 /* JNKeychain */,
10181017
83DF02A41AF86032000E289C /* LCDB */,
10191018
);
@@ -1286,6 +1285,24 @@
12861285
name = Frameworks;
12871286
sourceTree = "<group>";
12881287
};
1288+
D3516D1A26FB19640013BCF3 /* Vendor */ = {
1289+
isa = PBXGroup;
1290+
children = (
1291+
83FCB9911CEDC57C007D8712 /* LCNetworking */,
1292+
D3516D1B26FB19860013BCF3 /* WebSocket */,
1293+
);
1294+
path = Vendor;
1295+
sourceTree = "<group>";
1296+
};
1297+
D3516D1B26FB19860013BCF3 /* WebSocket */ = {
1298+
isa = PBXGroup;
1299+
children = (
1300+
D3120E0823B0DA8E00A64120 /* LCRTMWebSocket.h */,
1301+
D3120E0923B0DA8E00A64120 /* LCRTMWebSocket.m */,
1302+
);
1303+
path = WebSocket;
1304+
sourceTree = "<group>";
1305+
};
12891306
D365E42126C3D23900148DE8 /* Leaderboard */ = {
12901307
isa = PBXGroup;
12911308
children = (
@@ -1302,8 +1319,6 @@
13021319
D3700B722475244E00678B2B /* LCRTMConnection.h */,
13031320
D34C417D2483C3FD00CD2459 /* LCRTMConnection_Internal.h */,
13041321
D3700B732475244E00678B2B /* LCRTMConnection.m */,
1305-
D3120E0823B0DA8E00A64120 /* LCRTMWebSocket.h */,
1306-
D3120E0923B0DA8E00A64120 /* LCRTMWebSocket.m */,
13071322
);
13081323
path = Connection;
13091324
sourceTree = "<group>";
@@ -1332,6 +1347,7 @@
13321347
D3F227BC2649133900A599F5 /* Sources */ = {
13331348
isa = PBXGroup;
13341349
children = (
1350+
D3516D1A26FB19640013BCF3 /* Vendor */,
13351351
8C8419881A5A791300C5C6C4 /* Foundation */,
13361352
D3F227BD264914E400A599F5 /* Realtime */,
13371353
);

‎AVOS/LeanCloudObjc/Foundation.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88

99
#import <Foundation/Foundation.h>
1010

11+
// Vendor
12+
#import "LCNetworking.h"
13+
1114
// Application
1215
#import "LCApplication.h"
1316

@@ -62,6 +65,3 @@
6265

6366
// Leaderboard
6467
#import "LCLeaderboard.h"
65-
66-
// Misc
67-
#import "LCNetworkReachabilityManager.h"

‎AVOS/LeanCloudObjc/Realtime.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#import "Foundation.h"
1212

13-
// WebSocket
13+
// Vendor
1414
#import "LCRTMWebSocket.h"
1515

1616
// Constant

AVOS/Sources/Foundation/Vendor/LCNetworking/LCCompatibilityMacros.h renamed to AVOS/Sources/Vendor/LCNetworking/LCCompatibilityMacros.h

File renamed without changes.

AVOS/Sources/Foundation/Vendor/LCNetworking/LCHTTPSessionManager.h renamed to AVOS/Sources/Vendor/LCNetworking/LCHTTPSessionManager.h

File renamed without changes.

AVOS/Sources/Foundation/Vendor/LCNetworking/LCHTTPSessionManager.m renamed to AVOS/Sources/Vendor/LCNetworking/LCHTTPSessionManager.m

File renamed without changes.

AVOS/Sources/Foundation/Vendor/LCNetworking/LCNetworkReachabilityManager.h renamed to AVOS/Sources/Vendor/LCNetworking/LCNetworkReachabilityManager.h

File renamed without changes.

AVOS/Sources/Foundation/Vendor/LCNetworking/LCNetworkReachabilityManager.m renamed to AVOS/Sources/Vendor/LCNetworking/LCNetworkReachabilityManager.m

File renamed without changes.

AVOS/Sources/Foundation/Vendor/LCNetworking/LCNetworking.h renamed to AVOS/Sources/Vendor/LCNetworking/LCNetworking.h

File renamed without changes.

AVOS/Sources/Foundation/Vendor/LCNetworking/LCSecurityPolicy.h renamed to AVOS/Sources/Vendor/LCNetworking/LCSecurityPolicy.h

File renamed without changes.

0 commit comments

Comments
 (0)