Skip to content

Commit 66b8b09

Browse files
drdazdrdaz
committed
Merge branch 'Fix_macOS_Tests'
2 parents 0d4fe89 + c46550b commit 66b8b09

File tree

3 files changed

+25
-13
lines changed

3 files changed

+25
-13
lines changed

‎.circleci/config.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,20 @@ jobs:
2929
steps:
3030
- checkout
3131
- run: *prepare
32+
- run:
33+
name: "Create and set the default keychain"
34+
command: |
35+
security create-keychain -p "" temporary
36+
security default-keychain -s temporary
37+
security unlock-keychain -p "" temporary
38+
security set-keychain-settings -lut 7200 temporary
3239
- run: bundle exec rake test:macos
3340
- run: bash <(curl -s https://codecov.io/bash)
3441
- store_test_results:
3542
path: build/reports
43+
- store_artifacts:
44+
path: build/reports
45+
destination: test_results
3646
facebook_utils:
3747
<<: *defaults
3848
steps:

‎Parse/Parse.xcodeproj/project.pbxproj

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
4A13525520282A51000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13518420281768000F5FD5 /* Bolts.framework */; };
2727
4A13525620282B4D000F5FD5 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97010FAC1630B18F00AB761E /* Parse.framework */; };
2828
4A13525F20283603000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13518820281768000F5FD5 /* Bolts.framework */; };
29-
4A13528A202895ED000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A135289202895ED000F5FD5 /* Bolts.framework */; };
30-
4A13528C20289BB6000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13528B20289BB5000F5FD5 /* Bolts.framework */; };
31-
4A13528F20289BD1000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13528D20289BC3000F5FD5 /* Bolts.framework */; };
3229
4A2C10B32152FEF200FA7D0E /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13518820281768000F5FD5 /* Bolts.framework */; };
3330
4AAEAA40200BE14B00AA7479 /* third_party_licenses.txt in Resources */ = {isa = PBXBuildFile; fileRef = 8139B12C1A7BF559002BEF84 /* third_party_licenses.txt */; };
3431
4ABF398C1F54592100BBA75A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4ABF398B1F54592100BBA75A /* Main.storyboard */; };
@@ -2663,6 +2660,9 @@
26632660
B141170F1E5D081500F70D7A /* PFFileUploadResult.h in Headers */ = {isa = PBXBuildFile; fileRef = B141170A1E5D081500F70D7A /* PFFileUploadResult.h */; settings = {ATTRIBUTES = (Public, ); }; };
26642661
B14117101E5D081500F70D7A /* PFFileUploadResult.h in Headers */ = {isa = PBXBuildFile; fileRef = B141170A1E5D081500F70D7A /* PFFileUploadResult.h */; settings = {ATTRIBUTES = (Public, ); }; };
26652662
B14117111E5D081500F70D7A /* PFFileUploadResult.h in Headers */ = {isa = PBXBuildFile; fileRef = B141170A1E5D081500F70D7A /* PFFileUploadResult.h */; settings = {ATTRIBUTES = (Public, ); }; };
2663+
BCC5EAB322D5F97E00CF8900 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCC5EAB222D5F97D00CF8900 /* Bolts.framework */; };
2664+
BCC5EAB522D5F98F00CF8900 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCC5EAB422D5F98F00CF8900 /* Bolts.framework */; };
2665+
BCC5EAB622D5F9BA00CF8900 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCC5EAAC22D5F96600CF8900 /* Bolts.framework */; };
26662666
F50C66331B33A708001941A6 /* PFPushUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = F50C66311B33A708001941A6 /* PFPushUtilities.h */; settings = {ATTRIBUTES = (Private, ); }; };
26672667
F50C66341B33A708001941A6 /* PFPushUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = F50C66321B33A708001941A6 /* PFPushUtilities.m */; };
26682668
F50C667C1B34B231001941A6 /* PFPushUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = F50C66321B33A708001941A6 /* PFPushUtilities.m */; };
@@ -3010,9 +3010,6 @@
30103010
4A0ECC9B200DA25700BA84A3 /* OCMock.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OCMock.framework; sourceTree = BUILT_PRODUCTS_DIR; };
30113011
4A0ECC9D200DA26000BA84A3 /* OCMock.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OCMock.framework; sourceTree = BUILT_PRODUCTS_DIR; };
30123012
4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Bolts.xcodeproj; path = "../Carthage/Checkouts/Bolts-ObjC/Bolts.xcodeproj"; sourceTree = "<group>"; };
3013-
4A135289202895ED000F5FD5 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../Carthage/Build/iOS/Bolts.framework; sourceTree = "<group>"; };
3014-
4A13528B20289BB5000F5FD5 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../Carthage/Build/watchOS/Bolts.framework; sourceTree = "<group>"; };
3015-
4A13528D20289BC3000F5FD5 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../Carthage/Build/tvOS/Bolts.framework; sourceTree = "<group>"; };
30163013
4ABF398B1F54592100BBA75A /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
30173014
4AE33A0B1F5451AD0088DCA0 /* ParseUnitTests-iOS-host.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ParseUnitTests-iOS-host.app"; sourceTree = BUILT_PRODUCTS_DIR; };
30183015
4AE33A0D1F5451AD0088DCA0 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
@@ -3523,6 +3520,9 @@
35233520
B141169D1E5BC24B00F70D7A /* PFFileUploadController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFFileUploadController.h; sourceTree = "<group>"; };
35243521
B14116FB1E5D078E00F70D7A /* PFFileUploadResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFFileUploadResult.m; sourceTree = "<group>"; };
35253522
B141170A1E5D081500F70D7A /* PFFileUploadResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFFileUploadResult.h; sourceTree = "<group>"; };
3523+
BCC5EAAC22D5F96600CF8900 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../Carthage/Build/iOS/Bolts.framework; sourceTree = "<group>"; };
3524+
BCC5EAB222D5F97D00CF8900 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../Carthage/Build/tvOS/Bolts.framework; sourceTree = "<group>"; };
3525+
BCC5EAB422D5F98F00CF8900 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../Carthage/Build/watchOS/Bolts.framework; sourceTree = "<group>"; };
35263526
E9BBE98E16D18E5800CD7B52 /* PFObject+Subclass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "PFObject+Subclass.h"; path = "Parse/PFObject+Subclass.h"; sourceTree = SOURCE_ROOT; };
35273527
E9E81E8316EEF93E001D034F /* PFSubclassing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFSubclassing.h; sourceTree = "<group>"; };
35283528
F50C66311B33A708001941A6 /* PFPushUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFPushUtilities.h; sourceTree = "<group>"; };
@@ -3647,7 +3647,7 @@
36473647
81C587171C3B0B22000063C6 /* CoreLocation.framework in Frameworks */,
36483648
81C587151C3B0B1C000063C6 /* AudioToolbox.framework in Frameworks */,
36493649
81C587131C3B0B18000063C6 /* UIKit.framework in Frameworks */,
3650-
4A13528A202895ED000F5FD5 /* Bolts.framework in Frameworks */,
3650+
BCC5EAB622D5F9BA00CF8900 /* Bolts.framework in Frameworks */,
36513651
);
36523652
runOnlyForDeploymentPostprocessing = 0;
36533653
};
@@ -3661,15 +3661,15 @@
36613661
81C587261C3B0B7F000063C6 /* CoreLocation.framework in Frameworks */,
36623662
81C587241C3B0B7B000063C6 /* Security.framework in Frameworks */,
36633663
81C587221C3B0B77000063C6 /* SystemConfiguration.framework in Frameworks */,
3664-
4A13528F20289BD1000F5FD5 /* Bolts.framework in Frameworks */,
3664+
BCC5EAB322D5F97E00CF8900 /* Bolts.framework in Frameworks */,
36653665
);
36663666
runOnlyForDeploymentPostprocessing = 0;
36673667
};
36683668
81C5864B1C3B0AA9000063C6 /* Frameworks */ = {
36693669
isa = PBXFrameworksBuildPhase;
36703670
buildActionMask = 2147483647;
36713671
files = (
3672-
4A13528C20289BB6000F5FD5 /* Bolts.framework in Frameworks */,
3672+
BCC5EAB522D5F98F00CF8900 /* Bolts.framework in Frameworks */,
36733673
81C587351C3B0BBE000063C6 /* WatchKit.framework in Frameworks */,
36743674
81C587331C3B0BB9000063C6 /* CoreLocation.framework in Frameworks */,
36753675
81C587311C3B0BB6000063C6 /* Security.framework in Frameworks */,
@@ -3910,9 +3910,9 @@
39103910
09D3364C139C54940098E916 /* Frameworks */ = {
39113911
isa = PBXGroup;
39123912
children = (
3913-
4A135289202895ED000F5FD5 /* Bolts.framework */,
3914-
4A13528B20289BB5000F5FD5 /* Bolts.framework */,
3915-
4A13528D20289BC3000F5FD5 /* Bolts.framework */,
3913+
BCC5EAAC22D5F96600CF8900 /* Bolts.framework */,
3914+
BCC5EAB222D5F97D00CF8900 /* Bolts.framework */,
3915+
BCC5EAB422D5F98F00CF8900 /* Bolts.framework */,
39163916
4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */,
39173917
4A0ECC9D200DA26000BA84A3 /* OCMock.framework */,
39183918
4A0ECC9B200DA25700BA84A3 /* OCMock.framework */,
@@ -8939,6 +8939,7 @@
89398939
isa = XCBuildConfiguration;
89408940
baseConfigurationReference = F55ABB5A1B4F39DA00A0ECD5 /* ParseUnitTests-macOS.xcconfig */;
89418941
buildSettings = {
8942+
MACOSX_DEPLOYMENT_TARGET = 10.12;
89428943
SWIFT_VERSION = 5.0;
89438944
};
89448945
name = Debug;
@@ -8947,6 +8948,7 @@
89478948
isa = XCBuildConfiguration;
89488949
baseConfigurationReference = F55ABB5A1B4F39DA00A0ECD5 /* ParseUnitTests-macOS.xcconfig */;
89498950
buildSettings = {
8951+
MACOSX_DEPLOYMENT_TARGET = 10.12;
89508952
SWIFT_VERSION = 5.0;
89518953
};
89528954
name = Release;

‎Vendor/xctoolchain

0 commit comments

Comments
 (0)