Skip to content

Commit 1e0526e

Browse files
zapcannon87zapcannon87
authored
Merge pull request leancloud#591 from zapcannon87/master
fix(foundation): crash in macOS
2 parents 8cd6450 + b4aa22d commit 1e0526e

21 files changed

+392
-110
lines changed

‎AVOS/AVOS.xcodeproj/project.pbxproj

Lines changed: 157 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -838,6 +838,10 @@
838838
D33B830C210F1679001D1CCD /* AVIMClientPushManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D33B8309210F1679001D1CCD /* AVIMClientPushManager.m */; };
839839
D33B830D210F1679001D1CCD /* AVIMClientPushManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D33B8309210F1679001D1CCD /* AVIMClientPushManager.m */; };
840840
D341F2A32018B6DB00408778 /* _10_MB_.png in Resources */ = {isa = PBXBuildFile; fileRef = D341F2A22018B6DB00408778 /* _10_MB_.png */; };
841+
D3460577238BE9390027E1D5 /* AVOSCloud_macOSTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3460576238BE9390027E1D5 /* AVOSCloud_macOSTests.swift */; };
842+
D3460579238BE9390027E1D5 /* AVOSCloud.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 70CA7F681BDE2DC3000A3B21 /* AVOSCloud.framework */; };
843+
D346057F238BE9840027E1D5 /* LCTestEnvironment.m in Sources */ = {isa = PBXBuildFile; fileRef = D3F8747A20F8B1690035C7D1 /* LCTestEnvironment.m */; };
844+
D3460580238BE9880027E1D5 /* LCTestBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = D30DF4151FDE38EF00F932BC /* LCTestBase.swift */; };
841845
D3472E1F2015CBC200AAD65F /* AVFileTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3472E1E2015CBC200AAD65F /* AVFileTestCase.swift */; };
842846
D34EBDCD211C20FF0092A538 /* LCRouter_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = D34EBDCC211C20FF0092A538 /* LCRouter_Internal.h */; };
843847
D34EBDCE211C20FF0092A538 /* LCRouter_Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = D34EBDCC211C20FF0092A538 /* LCRouter_Internal.h */; };
@@ -1056,6 +1060,13 @@
10561060
remoteGlobalIDString = 70CA7F671BDE2DC3000A3B21;
10571061
remoteInfo = "AVOSCloud-macOS";
10581062
};
1063+
D346057A238BE9390027E1D5 /* PBXContainerItemProxy */ = {
1064+
isa = PBXContainerItemProxy;
1065+
containerPortal = 8C84197B1A5A78E100C5C6C4 /* Project object */;
1066+
proxyType = 1;
1067+
remoteGlobalIDString = 70CA7F671BDE2DC3000A3B21;
1068+
remoteInfo = "AVOSCloud-macOS";
1069+
};
10591070
/* End PBXContainerItemProxy section */
10601071

10611072
/* Begin PBXCopyFilesBuildPhase section */
@@ -1377,6 +1388,10 @@
13771388
D33B8308210F1679001D1CCD /* AVIMClientPushManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AVIMClientPushManager.h; sourceTree = "<group>"; };
13781389
D33B8309210F1679001D1CCD /* AVIMClientPushManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AVIMClientPushManager.m; sourceTree = "<group>"; };
13791390
D341F2A22018B6DB00408778 /* _10_MB_.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = _10_MB_.png; sourceTree = "<group>"; };
1391+
D3460574238BE9390027E1D5 /* AVOSCloud-macOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "AVOSCloud-macOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
1392+
D3460576238BE9390027E1D5 /* AVOSCloud_macOSTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AVOSCloud_macOSTests.swift; sourceTree = "<group>"; };
1393+
D3460578238BE9390027E1D5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
1394+
D3460585238BEC060027E1D5 /* AVOSCloud-macOSTests-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "AVOSCloud-macOSTests-Bridging-Header.h"; sourceTree = "<group>"; };
13801395
D3472E1E2015CBC200AAD65F /* AVFileTestCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AVFileTestCase.swift; sourceTree = "<group>"; };
13811396
D34EBDCC211C20FF0092A538 /* LCRouter_Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LCRouter_Internal.h; sourceTree = "<group>"; };
13821397
D34FD72B2068CFE900B7C11B /* AVLiveQuery_Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AVLiveQuery_Internal.h; sourceTree = "<group>"; };
@@ -1552,6 +1567,14 @@
15521567
);
15531568
runOnlyForDeploymentPostprocessing = 0;
15541569
};
1570+
D3460571238BE9390027E1D5 /* Frameworks */ = {
1571+
isa = PBXFrameworksBuildPhase;
1572+
buildActionMask = 2147483647;
1573+
files = (
1574+
D3460579238BE9390027E1D5 /* AVOSCloud.framework in Frameworks */,
1575+
);
1576+
runOnlyForDeploymentPostprocessing = 0;
1577+
};
15551578
/* End PBXFrameworksBuildPhase section */
15561579

15571580
/* Begin PBXGroup section */
@@ -1742,6 +1765,7 @@
17421765
838CE3271EC97E6F00B24F5B /* AVOSCloudLiveQueryTests */,
17431766
7085D5321BEA2A0A00449DC1 /* Resources */,
17441767
D305F7AE2355771B00222EBC /* CLI */,
1768+
D3460575238BE9390027E1D5 /* AVOSCloud-macOSTests */,
17451769
8C8419871A5A791300C5C6C4 /* Products */,
17461770
D328B8E320FC863F0039091A /* Frameworks */,
17471771
);
@@ -1764,6 +1788,7 @@
17641788
838CE3231EC97E6E00B24F5B /* AVOSCloudLiveQuery-iOSTests.xctest */,
17651789
D305F7A72355760100222EBC /* CLI */,
17661790
D305F7E12355A02A00222EBC /* AVOSCloudLiveQuery.framework */,
1791+
D3460574238BE9390027E1D5 /* AVOSCloud-macOSTests.xctest */,
17671792
);
17681793
name = Products;
17691794
sourceTree = "<group>";
@@ -2331,6 +2356,16 @@
23312356
path = Resources;
23322357
sourceTree = "<group>";
23332358
};
2359+
D3460575238BE9390027E1D5 /* AVOSCloud-macOSTests */ = {
2360+
isa = PBXGroup;
2361+
children = (
2362+
D3460585238BEC060027E1D5 /* AVOSCloud-macOSTests-Bridging-Header.h */,
2363+
D3460576238BE9390027E1D5 /* AVOSCloud_macOSTests.swift */,
2364+
D3460578238BE9390027E1D5 /* Info.plist */,
2365+
);
2366+
path = "AVOSCloud-macOSTests";
2367+
sourceTree = "<group>";
2368+
};
23342369
D3472E212015D2AF00AAD65F /* Resources */ = {
23352370
isa = PBXGroup;
23362371
children = (
@@ -3213,14 +3248,32 @@
32133248
productReference = D305F7E12355A02A00222EBC /* AVOSCloudLiveQuery.framework */;
32143249
productType = "com.apple.product-type.framework";
32153250
};
3251+
D3460573238BE9390027E1D5 /* AVOSCloud-macOSTests */ = {
3252+
isa = PBXNativeTarget;
3253+
buildConfigurationList = D346057E238BE9390027E1D5 /* Build configuration list for PBXNativeTarget "AVOSCloud-macOSTests" */;
3254+
buildPhases = (
3255+
D3460570238BE9390027E1D5 /* Sources */,
3256+
D3460571238BE9390027E1D5 /* Frameworks */,
3257+
D3460572238BE9390027E1D5 /* Resources */,
3258+
);
3259+
buildRules = (
3260+
);
3261+
dependencies = (
3262+
D346057B238BE9390027E1D5 /* PBXTargetDependency */,
3263+
);
3264+
name = "AVOSCloud-macOSTests";
3265+
productName = "AVOSCloud-macOSTests";
3266+
productReference = D3460574238BE9390027E1D5 /* AVOSCloud-macOSTests.xctest */;
3267+
productType = "com.apple.product-type.bundle.unit-test";
3268+
};
32163269
/* End PBXNativeTarget section */
32173270

32183271
/* Begin PBXProject section */
32193272
8C84197B1A5A78E100C5C6C4 /* Project object */ = {
32203273
isa = PBXProject;
32213274
attributes = {
32223275
CLASSPREFIX = AV;
3223-
LastSwiftUpdateCheck = 1110;
3276+
LastSwiftUpdateCheck = 1120;
32243277
LastUpgradeCheck = 1110;
32253278
ORGANIZATIONNAME = "LeanCloud Inc.";
32263279
TargetAttributes = {
@@ -3265,6 +3318,11 @@
32653318
DevelopmentTeam = 7J5XFNL99Q;
32663319
ProvisioningStyle = Manual;
32673320
};
3321+
D3460573238BE9390027E1D5 = {
3322+
CreatedOnToolsVersion = 11.2.1;
3323+
DevelopmentTeam = 7J5XFNL99Q;
3324+
ProvisioningStyle = Automatic;
3325+
};
32683326
};
32693327
};
32703328
buildConfigurationList = 8C84197E1A5A78E100C5C6C4 /* Build configuration list for PBXProject "AVOS" */;
@@ -3292,6 +3350,7 @@
32923350
8C8419CC1A5A796000C5C6C4 /* AVOSCloudIM-iOSTests */,
32933351
838CE3221EC97E6E00B24F5B /* AVOSCloudLiveQuery-iOSTests */,
32943352
D305F7A62355760100222EBC /* CLI */,
3353+
D3460573238BE9390027E1D5 /* AVOSCloud-macOSTests */,
32953354
);
32963355
};
32973356
/* End PBXProject section */
@@ -3387,6 +3446,13 @@
33873446
);
33883447
runOnlyForDeploymentPostprocessing = 0;
33893448
};
3449+
D3460572238BE9390027E1D5 /* Resources */ = {
3450+
isa = PBXResourcesBuildPhase;
3451+
buildActionMask = 2147483647;
3452+
files = (
3453+
);
3454+
runOnlyForDeploymentPostprocessing = 0;
3455+
};
33903456
/* End PBXResourcesBuildPhase section */
33913457

33923458
/* Begin PBXSourcesBuildPhase section */
@@ -3873,6 +3939,16 @@
38733939
);
38743940
runOnlyForDeploymentPostprocessing = 0;
38753941
};
3942+
D3460570238BE9390027E1D5 /* Sources */ = {
3943+
isa = PBXSourcesBuildPhase;
3944+
buildActionMask = 2147483647;
3945+
files = (
3946+
D346057F238BE9840027E1D5 /* LCTestEnvironment.m in Sources */,
3947+
D3460577238BE9390027E1D5 /* AVOSCloud_macOSTests.swift in Sources */,
3948+
D3460580238BE9880027E1D5 /* LCTestBase.swift in Sources */,
3949+
);
3950+
runOnlyForDeploymentPostprocessing = 0;
3951+
};
38763952
/* End PBXSourcesBuildPhase section */
38773953

38783954
/* Begin PBXTargetDependency section */
@@ -3926,6 +4002,11 @@
39264002
target = 70CA7F671BDE2DC3000A3B21 /* AVOSCloud-macOS */;
39274003
targetProxy = D305F7FC2355A6C400222EBC /* PBXContainerItemProxy */;
39284004
};
4005+
D346057B238BE9390027E1D5 /* PBXTargetDependency */ = {
4006+
isa = PBXTargetDependency;
4007+
target = 70CA7F671BDE2DC3000A3B21 /* AVOSCloud-macOS */;
4008+
targetProxy = D346057A238BE9390027E1D5 /* PBXContainerItemProxy */;
4009+
};
39294010
/* End PBXTargetDependency section */
39304011

39314012
/* Begin XCBuildConfiguration section */
@@ -4846,6 +4927,72 @@
48464927
};
48474928
name = Release;
48484929
};
4930+
D346057C238BE9390027E1D5 /* Debug */ = {
4931+
isa = XCBuildConfiguration;
4932+
buildSettings = {
4933+
CODE_SIGN_STYLE = Automatic;
4934+
COMBINE_HIDPI_IMAGES = YES;
4935+
DEVELOPMENT_TEAM = 7J5XFNL99Q;
4936+
GCC_DYNAMIC_NO_PIC = NO;
4937+
GCC_PREPROCESSOR_DEFINITIONS = (
4938+
"DEBUG=1",
4939+
"$(inherited)",
4940+
"LC_URL_API=$(LC_URL_API)",
4941+
"LC_URL_RTMRouter=$(LC_URL_RTMRouter)",
4942+
"LC_URL_RTMServer=$(LC_URL_RTMServer)",
4943+
"LC_APP_ID=$(LC_APP_ID)",
4944+
"LC_APP_KEY=$(LC_APP_KEY)",
4945+
"LC_SERVER_TESTING=$(LC_SERVER_TESTING)",
4946+
);
4947+
INFOPLIST_FILE = "AVOSCloud-macOSTests/Info.plist";
4948+
LC_APP_ID = "\\@\\\"default\\\"";
4949+
LC_APP_KEY = "\\@\\\"default\\\"";
4950+
LC_SERVER_TESTING = 0;
4951+
LC_URL_API = "\\@\\\"default\\\"";
4952+
LC_URL_RTMRouter = "\\@\\\"default\\\"";
4953+
LC_URL_RTMServer = "\\@\\\"default\\\"";
4954+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
4955+
MACOSX_DEPLOYMENT_TARGET = 10.9;
4956+
PRODUCT_BUNDLE_IDENTIFIER = "LeanCloud.AVOSCloud-macOSTests";
4957+
PRODUCT_NAME = "$(TARGET_NAME)";
4958+
SDKROOT = macosx;
4959+
SWIFT_OBJC_BRIDGING_HEADER = "AVOSCloud-macOSTests/AVOSCloud-macOSTests-Bridging-Header.h";
4960+
SWIFT_VERSION = 5.0;
4961+
};
4962+
name = Debug;
4963+
};
4964+
D346057D238BE9390027E1D5 /* Release */ = {
4965+
isa = XCBuildConfiguration;
4966+
buildSettings = {
4967+
CODE_SIGN_STYLE = Automatic;
4968+
COMBINE_HIDPI_IMAGES = YES;
4969+
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
4970+
DEVELOPMENT_TEAM = 7J5XFNL99Q;
4971+
GCC_PREPROCESSOR_DEFINITIONS = (
4972+
"LC_URL_API=$(LC_URL_API)",
4973+
"LC_URL_RTMRouter=$(LC_URL_RTMRouter)",
4974+
"LC_URL_RTMServer=$(LC_URL_RTMServer)",
4975+
"LC_APP_ID=$(LC_APP_ID)",
4976+
"LC_APP_KEY=$(LC_APP_KEY)",
4977+
"LC_SERVER_TESTING=$(LC_SERVER_TESTING)",
4978+
);
4979+
INFOPLIST_FILE = "AVOSCloud-macOSTests/Info.plist";
4980+
LC_APP_ID = "\\@\\\"default\\\"";
4981+
LC_APP_KEY = "\\@\\\"default\\\"";
4982+
LC_SERVER_TESTING = 0;
4983+
LC_URL_API = "\\@\\\"default\\\"";
4984+
LC_URL_RTMRouter = "\\@\\\"default\\\"";
4985+
LC_URL_RTMServer = "\\@\\\"default\\\"";
4986+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
4987+
MACOSX_DEPLOYMENT_TARGET = 10.9;
4988+
PRODUCT_BUNDLE_IDENTIFIER = "LeanCloud.AVOSCloud-macOSTests";
4989+
PRODUCT_NAME = "$(TARGET_NAME)";
4990+
SDKROOT = macosx;
4991+
SWIFT_OBJC_BRIDGING_HEADER = "AVOSCloud-macOSTests/AVOSCloud-macOSTests-Bridging-Header.h";
4992+
SWIFT_VERSION = 5.0;
4993+
};
4994+
name = Release;
4995+
};
48494996
/* End XCBuildConfiguration section */
48504997

48514998
/* Begin XCConfigurationList section */
@@ -4966,6 +5113,15 @@
49665113
defaultConfigurationIsVisible = 0;
49675114
defaultConfigurationName = Release;
49685115
};
5116+
D346057E238BE9390027E1D5 /* Build configuration list for PBXNativeTarget "AVOSCloud-macOSTests" */ = {
5117+
isa = XCConfigurationList;
5118+
buildConfigurations = (
5119+
D346057C238BE9390027E1D5 /* Debug */,
5120+
D346057D238BE9390027E1D5 /* Release */,
5121+
);
5122+
defaultConfigurationIsVisible = 0;
5123+
defaultConfigurationName = Release;
5124+
};
49695125
/* End XCConfigurationList section */
49705126
};
49715127
rootObject = 8C84197B1A5A78E100C5C6C4 /* Project object */;

‎AVOS/AVOS.xcodeproj/project.xcworkspace/xcshareddata/AVOS.xcscmblueprint

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

‎AVOS/AVOS.xcodeproj/xcshareddata/xcschemes/AVOSCloud-macOSTests.xcscheme

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1120"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "NO"
13+
buildForArchiving = "NO"
14+
buildForAnalyzing = "NO">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "D3460573238BE9390027E1D5"
18+
BuildableName = "AVOSCloud-macOSTests.xctest"
19+
BlueprintName = "AVOSCloud-macOSTests"
20+
ReferencedContainer = "container:AVOS.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
<TestableReference
32+
skipped = "NO">
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "D3460573238BE9390027E1D5"
36+
BuildableName = "AVOSCloud-macOSTests.xctest"
37+
BlueprintName = "AVOSCloud-macOSTests"
38+
ReferencedContainer = "container:AVOS.xcodeproj">
39+
</BuildableReference>
40+
</TestableReference>
41+
</Testables>
42+
</TestAction>
43+
<LaunchAction
44+
buildConfiguration = "Debug"
45+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
46+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
47+
launchStyle = "0"
48+
useCustomWorkingDirectory = "NO"
49+
ignoresPersistentStateOnLaunch = "NO"
50+
debugDocumentVersioning = "YES"
51+
debugServiceExtension = "internal"
52+
allowLocationSimulation = "YES">
53+
</LaunchAction>
54+
<ProfileAction
55+
buildConfiguration = "Release"
56+
shouldUseLaunchSchemeArgsEnv = "YES"
57+
savedToolIdentifier = ""
58+
useCustomWorkingDirectory = "NO"
59+
debugDocumentVersioning = "YES">
60+
<MacroExpansion>
61+
<BuildableReference
62+
BuildableIdentifier = "primary"
63+
BlueprintIdentifier = "D3460573238BE9390027E1D5"
64+
BuildableName = "AVOSCloud-macOSTests.xctest"
65+
BlueprintName = "AVOSCloud-macOSTests"
66+
ReferencedContainer = "container:AVOS.xcodeproj">
67+
</BuildableReference>
68+
</MacroExpansion>
69+
</ProfileAction>
70+
<AnalyzeAction
71+
buildConfiguration = "Debug">
72+
</AnalyzeAction>
73+
<ArchiveAction
74+
buildConfiguration = "Release"
75+
revealArchiveInOrganizer = "YES">
76+
</ArchiveAction>
77+
</Scheme>

‎AVOS/AVOSCloud-macOSTests/AVOSCloud-macOSTests-Bridging-Header.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
//
2+
// Use this file to import your target's public headers that you would like to expose to Swift.
3+
//
4+
5+
#import "LCTestEnvironment.h"
6+
#import "AVOSCloud.h"

0 commit comments

Comments
 (0)