From 1d2c42fcf6690011d44a154fde25a44c5dd2ac0e Mon Sep 17 00:00:00 2001 From: Darren Black Date: Tue, 9 Jul 2019 17:29:37 +0200 Subject: [PATCH 1/7] Adds Bolts framework to macOS target. --- Parse/Parse.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Parse/Parse.xcodeproj/project.pbxproj b/Parse/Parse.xcodeproj/project.pbxproj index 4a2cd1fa5..ae0d5cb04 100644 --- a/Parse/Parse.xcodeproj/project.pbxproj +++ b/Parse/Parse.xcodeproj/project.pbxproj @@ -2663,6 +2663,7 @@ B141170F1E5D081500F70D7A /* PFFileUploadResult.h in Headers */ = {isa = PBXBuildFile; fileRef = B141170A1E5D081500F70D7A /* PFFileUploadResult.h */; settings = {ATTRIBUTES = (Public, ); }; }; B14117101E5D081500F70D7A /* PFFileUploadResult.h in Headers */ = {isa = PBXBuildFile; fileRef = B141170A1E5D081500F70D7A /* PFFileUploadResult.h */; settings = {ATTRIBUTES = (Public, ); }; }; B14117111E5D081500F70D7A /* PFFileUploadResult.h in Headers */ = {isa = PBXBuildFile; fileRef = B141170A1E5D081500F70D7A /* PFFileUploadResult.h */; settings = {ATTRIBUTES = (Public, ); }; }; + BC2EF86722D4E9D700E6143E /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC2EF86222D4E9D600E6143E /* Bolts.framework */; }; F50C66331B33A708001941A6 /* PFPushUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = F50C66311B33A708001941A6 /* PFPushUtilities.h */; settings = {ATTRIBUTES = (Private, ); }; }; F50C66341B33A708001941A6 /* PFPushUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = F50C66321B33A708001941A6 /* PFPushUtilities.m */; }; F50C667C1B34B231001941A6 /* PFPushUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = F50C66321B33A708001941A6 /* PFPushUtilities.m */; }; @@ -3523,6 +3524,7 @@ B141169D1E5BC24B00F70D7A /* PFFileUploadController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFFileUploadController.h; sourceTree = ""; }; B14116FB1E5D078E00F70D7A /* PFFileUploadResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFFileUploadResult.m; sourceTree = ""; }; B141170A1E5D081500F70D7A /* PFFileUploadResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFFileUploadResult.h; sourceTree = ""; }; + BC2EF86222D4E9D600E6143E /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../Carthage/Build/Mac/Bolts.framework; sourceTree = ""; }; E9BBE98E16D18E5800CD7B52 /* PFObject+Subclass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "PFObject+Subclass.h"; path = "Parse/PFObject+Subclass.h"; sourceTree = SOURCE_ROOT; }; E9E81E8316EEF93E001D034F /* PFSubclassing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFSubclassing.h; sourceTree = ""; }; F50C66311B33A708001941A6 /* PFPushUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFPushUtilities.h; sourceTree = ""; }; @@ -3687,6 +3689,7 @@ 97DE045C163214C0007154E8 /* SystemConfiguration.framework in Frameworks */, 97DE045A16321492007154E8 /* Security.framework in Frameworks */, 97DE045116321428007154E8 /* CoreLocation.framework in Frameworks */, + BC2EF86722D4E9D700E6143E /* Bolts.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3913,6 +3916,7 @@ 4A135289202895ED000F5FD5 /* Bolts.framework */, 4A13528B20289BB5000F5FD5 /* Bolts.framework */, 4A13528D20289BC3000F5FD5 /* Bolts.framework */, + BC2EF86222D4E9D600E6143E /* Bolts.framework */, 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */, 4A0ECC9D200DA26000BA84A3 /* OCMock.framework */, 4A0ECC9B200DA25700BA84A3 /* OCMock.framework */, From daff8bf7cd5b74dc8b3c6a4c46c04f10252eaac7 Mon Sep 17 00:00:00 2001 From: Darren Black Date: Tue, 9 Jul 2019 17:45:21 +0200 Subject: [PATCH 2/7] Removes extra reference to Bolts from Project --- Parse/Parse.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Parse/Parse.xcodeproj/project.pbxproj b/Parse/Parse.xcodeproj/project.pbxproj index ae0d5cb04..a212ca729 100644 --- a/Parse/Parse.xcodeproj/project.pbxproj +++ b/Parse/Parse.xcodeproj/project.pbxproj @@ -2663,7 +2663,6 @@ B141170F1E5D081500F70D7A /* PFFileUploadResult.h in Headers */ = {isa = PBXBuildFile; fileRef = B141170A1E5D081500F70D7A /* PFFileUploadResult.h */; settings = {ATTRIBUTES = (Public, ); }; }; B14117101E5D081500F70D7A /* PFFileUploadResult.h in Headers */ = {isa = PBXBuildFile; fileRef = B141170A1E5D081500F70D7A /* PFFileUploadResult.h */; settings = {ATTRIBUTES = (Public, ); }; }; B14117111E5D081500F70D7A /* PFFileUploadResult.h in Headers */ = {isa = PBXBuildFile; fileRef = B141170A1E5D081500F70D7A /* PFFileUploadResult.h */; settings = {ATTRIBUTES = (Public, ); }; }; - BC2EF86722D4E9D700E6143E /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC2EF86222D4E9D600E6143E /* Bolts.framework */; }; F50C66331B33A708001941A6 /* PFPushUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = F50C66311B33A708001941A6 /* PFPushUtilities.h */; settings = {ATTRIBUTES = (Private, ); }; }; F50C66341B33A708001941A6 /* PFPushUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = F50C66321B33A708001941A6 /* PFPushUtilities.m */; }; F50C667C1B34B231001941A6 /* PFPushUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = F50C66321B33A708001941A6 /* PFPushUtilities.m */; }; @@ -3689,7 +3688,6 @@ 97DE045C163214C0007154E8 /* SystemConfiguration.framework in Frameworks */, 97DE045A16321492007154E8 /* Security.framework in Frameworks */, 97DE045116321428007154E8 /* CoreLocation.framework in Frameworks */, - BC2EF86722D4E9D700E6143E /* Bolts.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -8943,6 +8941,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = F55ABB5A1B4F39DA00A0ECD5 /* ParseUnitTests-macOS.xcconfig */; buildSettings = { + MACOSX_DEPLOYMENT_TARGET = 10.12; SWIFT_VERSION = 5.0; }; name = Debug; @@ -8951,6 +8950,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = F55ABB5A1B4F39DA00A0ECD5 /* ParseUnitTests-macOS.xcconfig */; buildSettings = { + MACOSX_DEPLOYMENT_TARGET = 10.12; SWIFT_VERSION = 5.0; }; name = Release; From a464407f4edd8dd84dc92e80d3e5ff2b162eb2b1 Mon Sep 17 00:00:00 2001 From: Darren Black Date: Tue, 9 Jul 2019 21:46:30 +0200 Subject: [PATCH 3/7] Removes links to Carthage-built Bolts frameworks. They served no purpose and confused debugging. --- Parse/Parse.xcodeproj/project.pbxproj | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/Parse/Parse.xcodeproj/project.pbxproj b/Parse/Parse.xcodeproj/project.pbxproj index a212ca729..6101814e0 100644 --- a/Parse/Parse.xcodeproj/project.pbxproj +++ b/Parse/Parse.xcodeproj/project.pbxproj @@ -26,9 +26,6 @@ 4A13525520282A51000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13518420281768000F5FD5 /* Bolts.framework */; }; 4A13525620282B4D000F5FD5 /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 97010FAC1630B18F00AB761E /* Parse.framework */; }; 4A13525F20283603000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13518820281768000F5FD5 /* Bolts.framework */; }; - 4A13528A202895ED000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A135289202895ED000F5FD5 /* Bolts.framework */; }; - 4A13528C20289BB6000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13528B20289BB5000F5FD5 /* Bolts.framework */; }; - 4A13528F20289BD1000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13528D20289BC3000F5FD5 /* Bolts.framework */; }; 4A2C10B32152FEF200FA7D0E /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13518820281768000F5FD5 /* Bolts.framework */; }; 4AAEAA40200BE14B00AA7479 /* third_party_licenses.txt in Resources */ = {isa = PBXBuildFile; fileRef = 8139B12C1A7BF559002BEF84 /* third_party_licenses.txt */; }; 4ABF398C1F54592100BBA75A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4ABF398B1F54592100BBA75A /* Main.storyboard */; }; @@ -3010,9 +3007,6 @@ 4A0ECC9B200DA25700BA84A3 /* OCMock.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OCMock.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4A0ECC9D200DA26000BA84A3 /* OCMock.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = OCMock.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Bolts.xcodeproj; path = "../Carthage/Checkouts/Bolts-ObjC/Bolts.xcodeproj"; sourceTree = ""; }; - 4A135289202895ED000F5FD5 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../Carthage/Build/iOS/Bolts.framework; sourceTree = ""; }; - 4A13528B20289BB5000F5FD5 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../Carthage/Build/watchOS/Bolts.framework; sourceTree = ""; }; - 4A13528D20289BC3000F5FD5 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../Carthage/Build/tvOS/Bolts.framework; sourceTree = ""; }; 4ABF398B1F54592100BBA75A /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = ""; }; 4AE33A0B1F5451AD0088DCA0 /* ParseUnitTests-iOS-host.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ParseUnitTests-iOS-host.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 4AE33A0D1F5451AD0088DCA0 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; @@ -3523,7 +3517,6 @@ B141169D1E5BC24B00F70D7A /* PFFileUploadController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFFileUploadController.h; sourceTree = ""; }; B14116FB1E5D078E00F70D7A /* PFFileUploadResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFFileUploadResult.m; sourceTree = ""; }; B141170A1E5D081500F70D7A /* PFFileUploadResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFFileUploadResult.h; sourceTree = ""; }; - BC2EF86222D4E9D600E6143E /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../Carthage/Build/Mac/Bolts.framework; sourceTree = ""; }; E9BBE98E16D18E5800CD7B52 /* PFObject+Subclass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "PFObject+Subclass.h"; path = "Parse/PFObject+Subclass.h"; sourceTree = SOURCE_ROOT; }; E9E81E8316EEF93E001D034F /* PFSubclassing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFSubclassing.h; sourceTree = ""; }; F50C66311B33A708001941A6 /* PFPushUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFPushUtilities.h; sourceTree = ""; }; @@ -3648,7 +3641,6 @@ 81C587171C3B0B22000063C6 /* CoreLocation.framework in Frameworks */, 81C587151C3B0B1C000063C6 /* AudioToolbox.framework in Frameworks */, 81C587131C3B0B18000063C6 /* UIKit.framework in Frameworks */, - 4A13528A202895ED000F5FD5 /* Bolts.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3662,7 +3654,6 @@ 81C587261C3B0B7F000063C6 /* CoreLocation.framework in Frameworks */, 81C587241C3B0B7B000063C6 /* Security.framework in Frameworks */, 81C587221C3B0B77000063C6 /* SystemConfiguration.framework in Frameworks */, - 4A13528F20289BD1000F5FD5 /* Bolts.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3670,7 +3661,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4A13528C20289BB6000F5FD5 /* Bolts.framework in Frameworks */, 81C587351C3B0BBE000063C6 /* WatchKit.framework in Frameworks */, 81C587331C3B0BB9000063C6 /* CoreLocation.framework in Frameworks */, 81C587311C3B0BB6000063C6 /* Security.framework in Frameworks */, @@ -3911,10 +3901,6 @@ 09D3364C139C54940098E916 /* Frameworks */ = { isa = PBXGroup; children = ( - 4A135289202895ED000F5FD5 /* Bolts.framework */, - 4A13528B20289BB5000F5FD5 /* Bolts.framework */, - 4A13528D20289BC3000F5FD5 /* Bolts.framework */, - BC2EF86222D4E9D600E6143E /* Bolts.framework */, 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */, 4A0ECC9D200DA26000BA84A3 /* OCMock.framework */, 4A0ECC9B200DA25700BA84A3 /* OCMock.framework */, From e90cfbd0a43dd2203849eb44bf467144d60f993b Mon Sep 17 00:00:00 2001 From: Darren Black Date: Tue, 9 Jul 2019 22:32:01 +0200 Subject: [PATCH 4/7] Updates xctoolchain submodule --- Vendor/xctoolchain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vendor/xctoolchain b/Vendor/xctoolchain index 0d65d0601..690787abf 160000 --- a/Vendor/xctoolchain +++ b/Vendor/xctoolchain @@ -1 +1 @@ -Subproject commit 0d65d06013b47d100d07e8f34f91621726b76b89 +Subproject commit 690787abfa21eea11095adf662f6e71154b3b0c8 From 74b87a2dc634e166f1bc26ef12a8320009d1a688 Mon Sep 17 00:00:00 2001 From: Darren Black Date: Wed, 10 Jul 2019 12:51:14 +0200 Subject: [PATCH 5/7] Re-adds Carthage-built Bolts framework links for dynamic Parse targets --- Parse/Parse.xcodeproj/project.pbxproj | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Parse/Parse.xcodeproj/project.pbxproj b/Parse/Parse.xcodeproj/project.pbxproj index 6101814e0..c0db61fb6 100644 --- a/Parse/Parse.xcodeproj/project.pbxproj +++ b/Parse/Parse.xcodeproj/project.pbxproj @@ -2660,6 +2660,9 @@ B141170F1E5D081500F70D7A /* PFFileUploadResult.h in Headers */ = {isa = PBXBuildFile; fileRef = B141170A1E5D081500F70D7A /* PFFileUploadResult.h */; settings = {ATTRIBUTES = (Public, ); }; }; B14117101E5D081500F70D7A /* PFFileUploadResult.h in Headers */ = {isa = PBXBuildFile; fileRef = B141170A1E5D081500F70D7A /* PFFileUploadResult.h */; settings = {ATTRIBUTES = (Public, ); }; }; B14117111E5D081500F70D7A /* PFFileUploadResult.h in Headers */ = {isa = PBXBuildFile; fileRef = B141170A1E5D081500F70D7A /* PFFileUploadResult.h */; settings = {ATTRIBUTES = (Public, ); }; }; + BCC5EAB322D5F97E00CF8900 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCC5EAB222D5F97D00CF8900 /* Bolts.framework */; }; + BCC5EAB522D5F98F00CF8900 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCC5EAB422D5F98F00CF8900 /* Bolts.framework */; }; + BCC5EAB622D5F9BA00CF8900 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCC5EAAC22D5F96600CF8900 /* Bolts.framework */; }; F50C66331B33A708001941A6 /* PFPushUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = F50C66311B33A708001941A6 /* PFPushUtilities.h */; settings = {ATTRIBUTES = (Private, ); }; }; F50C66341B33A708001941A6 /* PFPushUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = F50C66321B33A708001941A6 /* PFPushUtilities.m */; }; F50C667C1B34B231001941A6 /* PFPushUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = F50C66321B33A708001941A6 /* PFPushUtilities.m */; }; @@ -3517,6 +3520,9 @@ B141169D1E5BC24B00F70D7A /* PFFileUploadController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFFileUploadController.h; sourceTree = ""; }; B14116FB1E5D078E00F70D7A /* PFFileUploadResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PFFileUploadResult.m; sourceTree = ""; }; B141170A1E5D081500F70D7A /* PFFileUploadResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFFileUploadResult.h; sourceTree = ""; }; + BCC5EAAC22D5F96600CF8900 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../Carthage/Build/iOS/Bolts.framework; sourceTree = ""; }; + BCC5EAB222D5F97D00CF8900 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../Carthage/Build/tvOS/Bolts.framework; sourceTree = ""; }; + BCC5EAB422D5F98F00CF8900 /* Bolts.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Bolts.framework; path = ../Carthage/Build/watchOS/Bolts.framework; sourceTree = ""; }; E9BBE98E16D18E5800CD7B52 /* PFObject+Subclass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "PFObject+Subclass.h"; path = "Parse/PFObject+Subclass.h"; sourceTree = SOURCE_ROOT; }; E9E81E8316EEF93E001D034F /* PFSubclassing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFSubclassing.h; sourceTree = ""; }; F50C66311B33A708001941A6 /* PFPushUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PFPushUtilities.h; sourceTree = ""; }; @@ -3641,6 +3647,7 @@ 81C587171C3B0B22000063C6 /* CoreLocation.framework in Frameworks */, 81C587151C3B0B1C000063C6 /* AudioToolbox.framework in Frameworks */, 81C587131C3B0B18000063C6 /* UIKit.framework in Frameworks */, + BCC5EAB622D5F9BA00CF8900 /* Bolts.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3654,6 +3661,7 @@ 81C587261C3B0B7F000063C6 /* CoreLocation.framework in Frameworks */, 81C587241C3B0B7B000063C6 /* Security.framework in Frameworks */, 81C587221C3B0B77000063C6 /* SystemConfiguration.framework in Frameworks */, + BCC5EAB322D5F97E00CF8900 /* Bolts.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3661,6 +3669,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + BCC5EAB522D5F98F00CF8900 /* Bolts.framework in Frameworks */, 81C587351C3B0BBE000063C6 /* WatchKit.framework in Frameworks */, 81C587331C3B0BB9000063C6 /* CoreLocation.framework in Frameworks */, 81C587311C3B0BB6000063C6 /* Security.framework in Frameworks */, @@ -3901,6 +3910,9 @@ 09D3364C139C54940098E916 /* Frameworks */ = { isa = PBXGroup; children = ( + BCC5EAAC22D5F96600CF8900 /* Bolts.framework */, + BCC5EAB222D5F97D00CF8900 /* Bolts.framework */, + BCC5EAB422D5F98F00CF8900 /* Bolts.framework */, 4A1351082027FCFB000F5FD5 /* Bolts.xcodeproj */, 4A0ECC9D200DA26000BA84A3 /* OCMock.framework */, 4A0ECC9B200DA25700BA84A3 /* OCMock.framework */, From 0137cc8d83239ca8cbdbc63aa159d02b8689938e Mon Sep 17 00:00:00 2001 From: Tom Fox Date: Wed, 10 Jul 2019 15:35:23 +0100 Subject: [PATCH 6/7] Update config.yml --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index a2e4772da..65ea90478 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,6 +33,9 @@ jobs: - run: bash <(curl -s https://codecov.io/bash) - store_test_results: path: build/reports + - store_artifacts: + path: build/reports + destination: test_results facebook_utils: <<: *defaults steps: From c46550b7e35c77d029fd1d37584734f908290c61 Mon Sep 17 00:00:00 2001 From: Darren Black Date: Tue, 10 Sep 2019 14:54:29 +0200 Subject: [PATCH 7/7] Manually sets keychain on CircleCI machine --- .circleci/config.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 65ea90478..d851912d8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,6 +29,13 @@ jobs: steps: - checkout - run: *prepare + - run: + name: "Create and set the default keychain" + command: | + security create-keychain -p "" temporary + security default-keychain -s temporary + security unlock-keychain -p "" temporary + security set-keychain-settings -lut 7200 temporary - run: bundle exec rake test:macos - run: bash <(curl -s https://codecov.io/bash) - store_test_results: