Skip to content

Commit ac7bd93

Browse files
drdaznoobs2ninjas
andauthored
Fix nightly build, add extra PR testing (#1490)
* Fixes Carthage nightly * Extra PR testing Adds carthage, cocoapods and deployment jobs to PR workflow * Redoing dependencies for dynamic frameworks * Finally found the fix. Co-authored-by: Nathan Kellert <[email protected]>
1 parent 4ba0593 commit ac7bd93

File tree

11 files changed

+94
-159
lines changed

11 files changed

+94
-159
lines changed

.circleci/config.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,13 @@ workflows:
105105
- twitter_utils
106106
- parseui
107107
- jazzy
108+
- deployment
109+
- cocoapods:
110+
requires:
111+
- deployment
112+
- carthage:
113+
requires:
114+
- deployment
108115
nightly:
109116
jobs:
110117
- deployment

Parse/Parse.xcodeproj/project.pbxproj

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2641,9 +2641,9 @@
26412641
B14117111E5D081500F70D7A /* PFFileUploadResult.h in Headers */ = {isa = PBXBuildFile; fileRef = B141170A1E5D081500F70D7A /* PFFileUploadResult.h */; settings = {ATTRIBUTES = (Public, ); }; };
26422642
B9312D5B23C4A6FC002D4A4C /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B9312D5623C4A6FC002D4A4C /* OCMock.framework */; };
26432643
B9312D5D23C4A775002D4A4C /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B9312D5C23C4A775002D4A4C /* OCMock.framework */; };
2644+
BC5511D6242E6E66008E5D9F /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCC5EAAC22D5F96600CF8900 /* Bolts.framework */; };
26442645
BCC5EAB322D5F97E00CF8900 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCC5EAB222D5F97D00CF8900 /* Bolts.framework */; };
26452646
BCC5EAB522D5F98F00CF8900 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCC5EAB422D5F98F00CF8900 /* Bolts.framework */; };
2646-
BCC5EAB622D5F9BA00CF8900 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BCC5EAAC22D5F96600CF8900 /* Bolts.framework */; };
26472647
F50C66331B33A708001941A6 /* PFPushUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = F50C66311B33A708001941A6 /* PFPushUtilities.h */; settings = {ATTRIBUTES = (Private, ); }; };
26482648
F50C66341B33A708001941A6 /* PFPushUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = F50C66321B33A708001941A6 /* PFPushUtilities.m */; };
26492649
F50C667C1B34B231001941A6 /* PFPushUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = F50C66321B33A708001941A6 /* PFPushUtilities.m */; };
@@ -3602,7 +3602,7 @@
36023602
isa = PBXFrameworksBuildPhase;
36033603
buildActionMask = 2147483647;
36043604
files = (
3605-
BCC5EAB622D5F9BA00CF8900 /* Bolts.framework in Frameworks */,
3605+
BC5511D6242E6E66008E5D9F /* Bolts.framework in Frameworks */,
36063606
);
36073607
runOnlyForDeploymentPostprocessing = 0;
36083608
};
@@ -8935,41 +8935,47 @@
89358935
isa = XCBuildConfiguration;
89368936
baseConfigurationReference = 81C582DE1C3B0A40000063C6 /* Parse-iOS-Dynamic.xcconfig */;
89378937
buildSettings = {
8938+
CLANG_MODULES_AUTOLINK = YES;
89388939
};
89398940
name = Debug;
89408941
};
89418942
81C5845C1C3B0A98000063C6 /* Release */ = {
89428943
isa = XCBuildConfiguration;
89438944
baseConfigurationReference = 81C582DE1C3B0A40000063C6 /* Parse-iOS-Dynamic.xcconfig */;
89448945
buildSettings = {
8946+
CLANG_MODULES_AUTOLINK = YES;
89458947
};
89468948
name = Release;
89478949
};
89488950
81C585BD1C3B0AA1000063C6 /* Debug */ = {
89498951
isa = XCBuildConfiguration;
89508952
baseConfigurationReference = 81C582DF1C3B0A40000063C6 /* Parse-tvOS-Dynamic.xcconfig */;
89518953
buildSettings = {
8954+
CLANG_MODULES_AUTOLINK = YES;
89528955
};
89538956
name = Debug;
89548957
};
89558958
81C585BE1C3B0AA1000063C6 /* Release */ = {
89568959
isa = XCBuildConfiguration;
89578960
baseConfigurationReference = 81C582DF1C3B0A40000063C6 /* Parse-tvOS-Dynamic.xcconfig */;
89588961
buildSettings = {
8962+
CLANG_MODULES_AUTOLINK = YES;
89598963
};
89608964
name = Release;
89618965
};
89628966
81C5870D1C3B0AA9000063C6 /* Debug */ = {
89638967
isa = XCBuildConfiguration;
89648968
baseConfigurationReference = 81C582E01C3B0A40000063C6 /* Parse-watchOS-Dynamic.xcconfig */;
89658969
buildSettings = {
8970+
CLANG_MODULES_AUTOLINK = YES;
89668971
};
89678972
name = Debug;
89688973
};
89698974
81C5870E1C3B0AA9000063C6 /* Release */ = {
89708975
isa = XCBuildConfiguration;
89718976
baseConfigurationReference = 81C582E01C3B0A40000063C6 /* Parse-watchOS-Dynamic.xcconfig */;
89728977
buildSettings = {
8978+
CLANG_MODULES_AUTOLINK = YES;
89738979
};
89748980
name = Release;
89758981
};

ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.pbxproj

Lines changed: 43 additions & 105 deletions
Large diffs are not rendered by default.

ParseFacebookUtils/ParseFacebookUtils/Internal/AuthenticationProvider/PFFacebookAuthenticationProvider.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99

1010
#import "PFFacebookAuthenticationProvider.h"
1111

12-
#import <FBSDKCoreKit/FBSDKAccessToken.h>
13-
#import <FBSDKCoreKit/FBSDKApplicationDelegate.h>
12+
#import <FBSDKCoreKit/FBSDKCoreKit.h>
1413

1514
#import "PFFacebookPrivateUtilities.h"
1615

ParseFacebookUtils/ParseFacebookUtils/Internal/PFFacebookPrivateUtilities.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
#import <Bolts/BFExecutor.h>
1414
#import <Bolts/BFTask.h>
15-
1615
#import <FBSDKCoreKit/FBSDKCoreKit.h>
1716

1817
#import <Parse/PFConstants.h>

ParseTwitterUtils/ParseTwitterUtils.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1018,13 +1018,15 @@
10181018
isa = XCBuildConfiguration;
10191019
baseConfigurationReference = 81ECACD91D1E14F300FA7673 /* ParseTwitterUtils-iOS-Dynamic.xcconfig */;
10201020
buildSettings = {
1021+
CLANG_MODULES_AUTOLINK = YES;
10211022
};
10221023
name = Debug;
10231024
};
10241025
81ECACD61D1E14E000FA7673 /* Release */ = {
10251026
isa = XCBuildConfiguration;
10261027
baseConfigurationReference = 81ECACD91D1E14F300FA7673 /* ParseTwitterUtils-iOS-Dynamic.xcconfig */;
10271028
buildSettings = {
1029+
CLANG_MODULES_AUTOLINK = YES;
10281030
};
10291031
name = Release;
10301032
};

ParseUI/Generated/PFResources.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// This is an auto-generated file.
22
#import <Foundation/Foundation.h>
33
@interface PFResources : NSObject
4-
+ (NSData *)twitter_icon3x_png;//modified:2018-11-08 12:38:47 +0700
5-
+ (NSData *)facebook_icon2x_png;//modified:2018-11-08 12:38:47 +0700
6-
+ (NSData *)parse_logo_png;//modified:2018-11-08 12:38:47 +0700
7-
+ (NSData *)facebook_icon3x_png;//modified:2018-11-08 12:38:47 +0700
8-
+ (NSData *)twitter_icon2x_png;//modified:2018-11-08 12:38:47 +0700
9-
+ (NSData *)parse_logo2x_png;//modified:2018-11-08 12:38:47 +0700
10-
+ (NSData *)parse_logo3x_png;//modified:2018-11-08 12:38:47 +0700
11-
+ (NSData *)facebook_icon_png;//modified:2018-11-08 12:38:47 +0700
12-
+ (NSData *)twitter_icon_png;//modified:2018-11-08 12:38:47 +0700
4+
+ (NSData *)twitter_icon3x_png;//modified:2019-12-10 03:26:51 -0600
5+
+ (NSData *)facebook_icon2x_png;//modified:2019-12-10 03:26:51 -0600
6+
+ (NSData *)parse_logo_png;//modified:2019-12-10 03:26:51 -0600
7+
+ (NSData *)facebook_icon3x_png;//modified:2019-12-10 03:26:51 -0600
8+
+ (NSData *)twitter_icon2x_png;//modified:2019-12-10 03:26:51 -0600
9+
+ (NSData *)parse_logo2x_png;//modified:2019-12-10 03:26:51 -0600
10+
+ (NSData *)parse_logo3x_png;//modified:2019-12-10 03:26:51 -0600
11+
+ (NSData *)facebook_icon_png;//modified:2019-12-10 03:26:51 -0600
12+
+ (NSData *)twitter_icon_png;//modified:2019-12-10 03:26:51 -0600
1313
@end

ParseUI/ParseUI.xcodeproj/project.pbxproj

Lines changed: 21 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,6 @@
6464
4A0ECC1F200D8C0200BA84A3 /* PFActivityIndicatorTableViewCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A9A943A200D0226005D8F4B /* PFActivityIndicatorTableViewCell.h */; };
6565
4A0ECC6F200D98FE00BA84A3 /* ParseFacebookUtilsV4.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A9A94DA200D04DE005D8F4B /* ParseFacebookUtilsV4.framework */; };
6666
4A0ECC72200D992600BA84A3 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A9A941E200D01F1005D8F4B /* Bolts.framework */; };
67-
4A0ECC74200D993000BA84A3 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A0ECC73200D993000BA84A3 /* UIKit.framework */; };
68-
4A0ECC78200D995300BA84A3 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A0ECC77200D995200BA84A3 /* StoreKit.framework */; };
69-
4A0ECC7E200D997400BA84A3 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A0ECC7D200D997400BA84A3 /* CoreGraphics.framework */; };
70-
4A0ECC8E200D9D1400BA84A3 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A9A94E4200D0598005D8F4B /* libsqlite3.tbd */; };
71-
4A0ECC90200D9D2700BA84A3 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A0ECC8F200D9D2700BA84A3 /* Security.framework */; };
72-
4A0ECC91200D9D3000BA84A3 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A9A94F6200D125A005D8F4B /* AudioToolbox.framework */; };
73-
4A0ECC93200D9D3900BA84A3 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A0ECC92200D9D3900BA84A3 /* CoreLocation.framework */; };
74-
4A0ECC94200D9D4400BA84A3 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A9A94E6200D05A5005D8F4B /* SystemConfiguration.framework */; };
7567
4A0ECCAE200DA7F300BA84A3 /* ParseUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A9A9497200D0329005D8F4B /* ParseUI.framework */; };
7668
4A0ECCB2200DA92700BA84A3 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A0ECC73200D993000BA84A3 /* UIKit.framework */; };
7769
4A1350D02027F6AB000F5FD5 /* ParseUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A0ECC24200D8C0200BA84A3 /* ParseUI.framework */; };
@@ -81,10 +73,6 @@
8173
4A1351E1202818EF000F5FD5 /* FBSDKLoginKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A1351DF202818EE000F5FD5 /* FBSDKLoginKit.framework */; };
8274
4A1351E2202818EF000F5FD5 /* FBSDKCoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A1351E0202818EE000F5FD5 /* FBSDKCoreKit.framework */; };
8375
4A1352392028205A000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13523820282059000F5FD5 /* Bolts.framework */; };
84-
4A13523A2028205A000F5FD5 /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A13523820282059000F5FD5 /* Bolts.framework */; };
85-
4A51E4452027CC4E0066DE1A /* ParseFacebookUtilsV4.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A51E43A2027CC330066DE1A /* ParseFacebookUtilsV4.framework */; };
86-
4A51E4462027CC4E0066DE1A /* ParseTwitterUtils.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A51E4272027CC2D0066DE1A /* ParseTwitterUtils.framework */; };
87-
4A51E46E2027DC130066DE1A /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A51E4592027DC000066DE1A /* Parse.framework */; };
8876
4A9A941A200D01F1005D8F4B /* Bolts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A9A941E200D01F1005D8F4B /* Bolts.framework */; };
8977
4A9A941B200D01F1005D8F4B /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A9A941F200D01F1005D8F4B /* Parse.framework */; };
9078
4A9A941D200D01F1005D8F4B /* ParseTwitterUtils.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A9A9421200D01F1005D8F4B /* ParseTwitterUtils.framework */; };
@@ -198,6 +186,9 @@
198186
81FC6B701A9D1CE900104E45 /* SubtitleImageCollectionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81FC6B6B1A9D1CE900104E45 /* SubtitleImageCollectionViewController.swift */; };
199187
81FC6B721A9D1CFD00104E45 /* SimpleQueryCollectionStoryboard-Swift.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81FC6B711A9D1CFD00104E45 /* SimpleQueryCollectionStoryboard-Swift.storyboard */; };
200188
81FC6B751A9D1D4700104E45 /* CustomProductTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81FC6B741A9D1D4700104E45 /* CustomProductTableViewController.swift */; };
189+
B9DDA281243C320E0003061D /* Parse.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A51E4592027DC000066DE1A /* Parse.framework */; };
190+
B9DDA283243C322D0003061D /* ParseTwitterUtils.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A51E4272027CC2D0066DE1A /* ParseTwitterUtils.framework */; };
191+
B9DDA284243C32E50003061D /* ParseFacebookUtilsV4.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A51E4362027CC330066DE1A /* ParseFacebookUtilsV4.framework */; };
201192
F57F3D231B0C03D40087F60B /* DeletionCollectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F57F3D201B0C03C90087F60B /* DeletionCollectionViewController.m */; };
202193
F57F3D241B0C03DB0087F60B /* DeletionTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F57F3D1C1B0C03BA0087F60B /* DeletionTableViewController.m */; };
203194
F57F3D271B0C050C0087F60B /* DeletionTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F57F3D251B0C04EF0087F60B /* DeletionTableViewController.swift */; };
@@ -261,13 +252,6 @@
261252
remoteGlobalIDString = 81ECACB71D1E14E000FA7673;
262253
remoteInfo = "ParseTwitterUtils-iOS-Dynamic";
263254
};
264-
4A1350D42027F846000F5FD5 /* PBXContainerItemProxy */ = {
265-
isa = PBXContainerItemProxy;
266-
containerPortal = 4A51E44B2027DC000066DE1A /* Parse.xcodeproj */;
267-
proxyType = 1;
268-
remoteGlobalIDString = 81C3821B19CCA89E0066284A;
269-
remoteInfo = "Parse-iOS";
270-
};
271255
4A1350D62027F846000F5FD5 /* PBXContainerItemProxy */ = {
272256
isa = PBXContainerItemProxy;
273257
containerPortal = 4A51E42C2027CC330066DE1A /* ParseFacebookUtils.xcodeproj */;
@@ -443,6 +427,13 @@
443427
remoteGlobalIDString = 81C582E11C3B0A98000063C6;
444428
remoteInfo = "Parse-iOS-Dynamic";
445429
};
430+
B9DDA27F243C31E30003061D /* PBXContainerItemProxy */ = {
431+
isa = PBXContainerItemProxy;
432+
containerPortal = 4A51E44B2027DC000066DE1A /* Parse.xcodeproj */;
433+
proxyType = 1;
434+
remoteGlobalIDString = 81C3821B19CCA89E0066284A;
435+
remoteInfo = "Parse-iOS";
436+
};
446437
/* End PBXContainerItemProxy section */
447438

448439
/* Begin PBXFileReference section */
@@ -628,18 +619,9 @@
628619
isa = PBXFrameworksBuildPhase;
629620
buildActionMask = 2147483647;
630621
files = (
631-
4A51E46E2027DC130066DE1A /* Parse.framework in Frameworks */,
632-
4A51E4452027CC4E0066DE1A /* ParseFacebookUtilsV4.framework in Frameworks */,
633-
4A51E4462027CC4E0066DE1A /* ParseTwitterUtils.framework in Frameworks */,
634-
4A13523A2028205A000F5FD5 /* Bolts.framework in Frameworks */,
635-
4A0ECC94200D9D4400BA84A3 /* SystemConfiguration.framework in Frameworks */,
636-
4A0ECC93200D9D3900BA84A3 /* CoreLocation.framework in Frameworks */,
637-
4A0ECC91200D9D3000BA84A3 /* AudioToolbox.framework in Frameworks */,
638-
4A0ECC90200D9D2700BA84A3 /* Security.framework in Frameworks */,
639-
4A0ECC8E200D9D1400BA84A3 /* libsqlite3.tbd in Frameworks */,
640-
4A0ECC7E200D997400BA84A3 /* CoreGraphics.framework in Frameworks */,
641-
4A0ECC78200D995300BA84A3 /* StoreKit.framework in Frameworks */,
642-
4A0ECC74200D993000BA84A3 /* UIKit.framework in Frameworks */,
622+
B9DDA284243C32E50003061D /* ParseFacebookUtilsV4.framework in Frameworks */,
623+
B9DDA283243C322D0003061D /* ParseTwitterUtils.framework in Frameworks */,
624+
B9DDA281243C320E0003061D /* Parse.framework in Frameworks */,
643625
);
644626
runOnlyForDeploymentPostprocessing = 0;
645627
};
@@ -1425,7 +1407,7 @@
14251407
buildRules = (
14261408
);
14271409
dependencies = (
1428-
4A1350D52027F846000F5FD5 /* PBXTargetDependency */,
1410+
B9DDA280243C31E30003061D /* PBXTargetDependency */,
14291411
4A1350D72027F846000F5FD5 /* PBXTargetDependency */,
14301412
4A1350D92027F846000F5FD5 /* PBXTargetDependency */,
14311413
4A0ECCAD200DA7D100BA84A3 /* PBXTargetDependency */,
@@ -1870,11 +1852,6 @@
18701852
name = "ParseTwitterUtils-iOS-Dynamic";
18711853
targetProxy = 4A1350CE2027F683000F5FD5 /* PBXContainerItemProxy */;
18721854
};
1873-
4A1350D52027F846000F5FD5 /* PBXTargetDependency */ = {
1874-
isa = PBXTargetDependency;
1875-
name = "Parse-iOS";
1876-
targetProxy = 4A1350D42027F846000F5FD5 /* PBXContainerItemProxy */;
1877-
};
18781855
4A1350D72027F846000F5FD5 /* PBXTargetDependency */ = {
18791856
isa = PBXTargetDependency;
18801857
name = "ParseFacebookUtilsV4-iOS";
@@ -1900,6 +1877,11 @@
19001877
name = "Parse-iOS-Dynamic";
19011878
targetProxy = 4A51E46C2027DC080066DE1A /* PBXContainerItemProxy */;
19021879
};
1880+
B9DDA280243C31E30003061D /* PBXTargetDependency */ = {
1881+
isa = PBXTargetDependency;
1882+
name = "Parse-iOS";
1883+
targetProxy = B9DDA27F243C31E30003061D /* PBXContainerItemProxy */;
1884+
};
19031885
/* End PBXTargetDependency section */
19041886

19051887
/* Begin PBXVariantGroup section */
@@ -2005,6 +1987,7 @@
20051987
CLANG_CXX_LIBRARY = "libc++";
20061988
CLANG_ENABLE_MODULES = YES;
20071989
CLANG_ENABLE_OBJC_ARC = YES;
1990+
CLANG_MODULES_AUTOLINK = YES;
20081991
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
20091992
CLANG_WARN_BOOL_CONVERSION = YES;
20101993
CLANG_WARN_COMMA = YES;
@@ -2069,6 +2052,7 @@
20692052
CLANG_CXX_LIBRARY = "libc++";
20702053
CLANG_ENABLE_MODULES = YES;
20712054
CLANG_ENABLE_OBJC_ARC = YES;
2055+
CLANG_MODULES_AUTOLINK = YES;
20722056
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
20732057
CLANG_WARN_BOOL_CONVERSION = YES;
20742058
CLANG_WARN_COMMA = YES;

0 commit comments

Comments
 (0)