Skip to content

Commit 6e811e7

Browse files
vazarkevychvazarkevych
committed
fix cocoapods tests for CI
1 parent c484c57 commit 6e811e7

File tree

5 files changed

+352
-16
lines changed

5 files changed

+352
-16
lines changed

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ jobs:
153153
steps:
154154
- uses: actions/checkout@v2
155155
- name: CocoaPods
156-
run: set -o pipefail && env NSUnbufferedIO=YES pod lib lint --allow-warnings --verbose
156+
run: set -o pipefail && env NSUnbufferedIO=YES pod lib lint --allow-warnings --verbose --skip-import-validation
157157
env:
158158
DEVELOPER_DIR: ${{ env.CI_XCODE_13 }}
159159

‎Parse.podspec

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@ Pod::Spec.new do |s|
8888
s.pod_target_xcconfig = {
8989
'GENERATE_INFOPLIST_FILE' => 'YES'
9090
}
91-
# s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'x86_64 armv7 arm64' }
92-
# s.pod_target_xcconfig = { 'ONLY_ACTIVE_ARCH' => 'YES' }
9391
end
9492

9593
s.subspec 'FacebookUtils' do |s|
@@ -108,6 +106,7 @@ Pod::Spec.new do |s|
108106
'SystemConfiguration'
109107
s.ios.weak_frameworks = 'Accounts',
110108
'Social'
109+
111110
s.libraries = 'z', 'sqlite3'
112111

113112
s.dependency 'Parse/Core'
@@ -122,9 +121,8 @@ Pod::Spec.new do |s|
122121
s.pod_target_xcconfig = {
123122
'GENERATE_INFOPLIST_FILE' => 'YES'
124123
}
125-
s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'x86_64 armv7 arm64' }
126-
# s.pod_target_xcconfig = { 'ONLY_ACTIVE_ARCH' => 'YES' }
127-
# s.ios.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'iOS-arm64' }
124+
s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=*simulator*]' => 'x86_64 armv7 arm64' }
125+
# s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'x86_64 armv7 arm64' }
128126
end
129127

130128
s.subspec 'FacebookUtils-iOS' do |s|
@@ -144,6 +142,7 @@ Pod::Spec.new do |s|
144142
'SystemConfiguration'
145143
s.ios.weak_frameworks = 'Accounts',
146144
'Social'
145+
147146
s.libraries = 'z', 'sqlite3'
148147

149148
s.dependency 'Parse/Core'
@@ -160,17 +159,16 @@ Pod::Spec.new do |s|
160159
'GENERATE_INFOPLIST_FILE' => 'YES'
161160
}
162161
s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'x86_64 armv7 arm64' }
163-
# s.pod_target_xcconfig = { 'ONLY_ACTIVE_ARCH' => 'YES' }
164-
# s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
162+
# s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'x86_64 armv7 arm64' }
165163
end
166164

167165
s.subspec 'FacebookUtils-tvOS' do |s|
168166
s.platform = :tvos
169167
s.tvos.deployment_target = '12.0'
170168
s.public_header_files = 'ParseFacebookUtilsTvOS/ParseFacebookUtilsTvOS/Source/*.h'
171-
s.private_header_files = 'ParseFacebookUtilsTvOS/ParseFacebookUtilsTvOS/Internal/*.h'
169+
s.private_header_files = 'ParseFacebookUtilsTvOS/ParseFacebookUtilsTvOS/Internal/**/*.h'
172170
s.source_files = 'ParseFacebookUtilsTvOS/ParseFacebookUtilsTvOS/Source/*.{h,m}',
173-
'ParseFacebookUtilsTvOS/ParseFacebookUtilsTvOS/Internal/*.{h,m}'
171+
'ParseFacebookUtilsTvOS/ParseFacebookUtilsTvOS/Internal/**/*.{h,m}'
174172

175173
s.frameworks = 'AudioToolbox',
176174
'CFNetwork',
@@ -186,17 +184,15 @@ Pod::Spec.new do |s|
186184
s.dependency 'Bolts/Tasks', '1.9.1'
187185
s.dependency 'FBSDKTVOSKit', '= 15.1.0'
188186
s.dependency 'FBSDKShareKit', '= 15.1.0'
189-
s.dependency 'FBSDKCoreKit_Basics', '= 15.1.0'
190187
s.user_target_xcconfig = {
191188
'GENERATE_INFOPLIST_FILE' => 'YES'
192189
}
193190

194191
s.pod_target_xcconfig = {
195192
'GENERATE_INFOPLIST_FILE' => 'YES'
196193
}
197-
s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'x86_64 armv7 arm64' }
198-
# s.pod_target_xcconfig = { 'ONLY_ACTIVE_ARCH' => 'YES' }
199-
# s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
194+
s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=*simulator*]' => 'x86_64 armv7 arm64' }
195+
# s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'x86_64 armv7 arm64' }
200196
end
201197

202198
s.subspec 'TwitterUtils' do |s|
@@ -251,8 +247,6 @@ Pod::Spec.new do |s|
251247
s.pod_target_xcconfig = {
252248
'GENERATE_INFOPLIST_FILE' => 'YES'
253249
}
254-
255-
# s.pod_target_xcconfig = { 'ONLY_ACTIVE_ARCH' => 'YES' }
256250
end
257251

258252
# prepare command for parseUI

‎ParseFacebookUtils/ParseFacebookUtils.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -935,6 +935,7 @@
935935
isa = XCBuildConfiguration;
936936
baseConfigurationReference = 4AAEAA93200C026300AA7479 /* ParseFacebookUtilsV4-tvOS-Dynamic.xcconfig */;
937937
buildSettings = {
938+
ARCHS = "$(ARCHS_STANDARD)";
938939
CLANG_MODULES_AUTOLINK = YES;
939940
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
940941
SWIFT_VERSION = 5.0;
@@ -946,6 +947,7 @@
946947
isa = XCBuildConfiguration;
947948
baseConfigurationReference = 4AAEAA93200C026300AA7479 /* ParseFacebookUtilsV4-tvOS-Dynamic.xcconfig */;
948949
buildSettings = {
950+
ARCHS = "$(ARCHS_STANDARD)";
949951
CLANG_MODULES_AUTOLINK = YES;
950952
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
951953
SWIFT_VERSION = 5.0;
@@ -957,6 +959,7 @@
957959
isa = XCBuildConfiguration;
958960
baseConfigurationReference = 81FE7F721C1778FC00E6BD34 /* ParseFacebookUtilsV4-tvOS.xcconfig */;
959961
buildSettings = {
962+
ARCHS = "$(ARCHS_STANDARD)";
960963
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
961964
TVOS_DEPLOYMENT_TARGET = 9.0;
962965
};
@@ -966,6 +969,7 @@
966969
isa = XCBuildConfiguration;
967970
baseConfigurationReference = 81FE7F721C1778FC00E6BD34 /* ParseFacebookUtilsV4-tvOS.xcconfig */;
968971
buildSettings = {
972+
ARCHS = "$(ARCHS_STANDARD)";
969973
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
970974
TVOS_DEPLOYMENT_TARGET = 9.0;
971975
};

‎ParseFacebookUtilsTvOs/ParseFacebookUtilsTvOS.xcodeproj/project.pbxproj

Lines changed: 171 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,76 @@
7171
remoteGlobalIDString = 4AAEAA77200C022300AA7479;
7272
remoteInfo = "ParseFacebookUtilsV4-tvOS-Dynamic";
7373
};
74+
84199A032947592D000D241B /* PBXContainerItemProxy */ = {
75+
isa = PBXContainerItemProxy;
76+
containerPortal = 841999F42947592D000D241B /* Parse.xcodeproj */;
77+
proxyType = 2;
78+
remoteGlobalIDString = 81C3821C19CCA89E0066284A;
79+
remoteInfo = "Parse-iOS";
80+
};
81+
84199A052947592D000D241B /* PBXContainerItemProxy */ = {
82+
isa = PBXContainerItemProxy;
83+
containerPortal = 841999F42947592D000D241B /* Parse.xcodeproj */;
84+
proxyType = 2;
85+
remoteGlobalIDString = 81C5845D1C3B0A98000063C6;
86+
remoteInfo = "Parse-iOS-Dynamic";
87+
};
88+
84199A072947592D000D241B /* PBXContainerItemProxy */ = {
89+
isa = PBXContainerItemProxy;
90+
containerPortal = 841999F42947592D000D241B /* Parse.xcodeproj */;
91+
proxyType = 2;
92+
remoteGlobalIDString = 816F449B1A8E8933009CDB32;
93+
remoteInfo = "ParseUnitTests-iOS";
94+
};
95+
84199A092947592D000D241B /* PBXContainerItemProxy */ = {
96+
isa = PBXContainerItemProxy;
97+
containerPortal = 841999F42947592D000D241B /* Parse.xcodeproj */;
98+
proxyType = 2;
99+
remoteGlobalIDString = 97010FAC1630B18F00AB761E;
100+
remoteInfo = "Parse-macOS";
101+
};
102+
84199A0B2947592D000D241B /* PBXContainerItemProxy */ = {
103+
isa = PBXContainerItemProxy;
104+
containerPortal = 841999F42947592D000D241B /* Parse.xcodeproj */;
105+
proxyType = 2;
106+
remoteGlobalIDString = 81C09F861AF97A490043B49C;
107+
remoteInfo = "ParseUnitTests-macOS";
108+
};
109+
84199A0D2947592D000D241B /* PBXContainerItemProxy */ = {
110+
isa = PBXContainerItemProxy;
111+
containerPortal = 841999F42947592D000D241B /* Parse.xcodeproj */;
112+
proxyType = 2;
113+
remoteGlobalIDString = 815F24151BD04D150054659F;
114+
remoteInfo = "Parse-tvOS";
115+
};
116+
84199A0F2947592D000D241B /* PBXContainerItemProxy */ = {
117+
isa = PBXContainerItemProxy;
118+
containerPortal = 841999F42947592D000D241B /* Parse.xcodeproj */;
119+
proxyType = 2;
120+
remoteGlobalIDString = 81C585BF1C3B0AA1000063C6;
121+
remoteInfo = "Parse-tvOS-Dynamic";
122+
};
123+
84199A112947592D000D241B /* PBXContainerItemProxy */ = {
124+
isa = PBXContainerItemProxy;
125+
containerPortal = 841999F42947592D000D241B /* Parse.xcodeproj */;
126+
proxyType = 2;
127+
remoteGlobalIDString = 810156691BB3832700D7C7BD;
128+
remoteInfo = "Parse-watchOS";
129+
};
130+
84199A132947592D000D241B /* PBXContainerItemProxy */ = {
131+
isa = PBXContainerItemProxy;
132+
containerPortal = 841999F42947592D000D241B /* Parse.xcodeproj */;
133+
proxyType = 2;
134+
remoteGlobalIDString = 81C5870F1C3B0AA9000063C6;
135+
remoteInfo = "Parse-watchOS-Dynamic";
136+
};
137+
84199A152947592D000D241B /* PBXContainerItemProxy */ = {
138+
isa = PBXContainerItemProxy;
139+
containerPortal = 841999F42947592D000D241B /* Parse.xcodeproj */;
140+
proxyType = 2;
141+
remoteGlobalIDString = 4AE33A0B1F5451AD0088DCA0;
142+
remoteInfo = "ParseUnitTests-iOS-host";
143+
};
74144
/* End PBXContainerItemProxy section */
75145

76146
/* Begin PBXCopyFilesBuildPhase section */
@@ -116,6 +186,9 @@
116186
8121EAAD1D39862400AC0B02 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
117187
81FE7F721C1778FC00E6BD34 /* ParseFacebookUtilsTvOS.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ParseFacebookUtilsTvOS.xcconfig; sourceTree = "<group>"; };
118188
81FE7F8B1C17790400E6BD34 /* ParseFacebookUtilsTvOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ParseFacebookUtilsTvOS.framework; sourceTree = BUILT_PRODUCTS_DIR; };
189+
841999B829475714000D241B /* Parse.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Parse.framework; sourceTree = BUILT_PRODUCTS_DIR; };
190+
841999F42947592D000D241B /* Parse.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Parse.xcodeproj; path = "/Users/admin/Documents/Projects/Parse-SDK-iOS-OSX/Parse/Parse.xcodeproj"; sourceTree = "<absolute>"; };
191+
84B4D990294756A500A065D4 /* Parse.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Parse.framework; sourceTree = BUILT_PRODUCTS_DIR; };
119192
/* End PBXFileReference section */
120193

121194
/* Begin PBXFrameworksBuildPhase section */
@@ -160,6 +233,7 @@
160233
7C5F7FA529212A9F0035B219 /* ParseFacebookUtilsTvOS */,
161234
0867D69AFE84028FC02AAC07 /* Frameworks */,
162235
034768DFFF38A50411DB9C8B /* Products */,
236+
841999F42947592D000D241B /* Parse.xcodeproj */,
163237
);
164238
indentWidth = 4;
165239
name = Breakpad;
@@ -168,6 +242,8 @@
168242
0867D69AFE84028FC02AAC07 /* Frameworks */ = {
169243
isa = PBXGroup;
170244
children = (
245+
841999B829475714000D241B /* Parse.framework */,
246+
84B4D990294756A500A065D4 /* Parse.framework */,
171247
7C77D05B2929160800C4D90E /* FBAEMKit.xcframework */,
172248
7C77D0582929160800C4D90E /* FBSDKCoreKit_Basics.xcframework */,
173249
7C77D05C2929160800C4D90E /* FBSDKCoreKit.xcframework */,
@@ -286,6 +362,23 @@
286362
path = Project;
287363
sourceTree = "<group>";
288364
};
365+
841999F52947592D000D241B /* Products */ = {
366+
isa = PBXGroup;
367+
children = (
368+
84199A042947592D000D241B /* Parse.framework */,
369+
84199A062947592D000D241B /* Parse.framework */,
370+
84199A082947592D000D241B /* ParseUnitTests-iOS.xctest */,
371+
84199A0A2947592D000D241B /* Parse.framework */,
372+
84199A0C2947592D000D241B /* ParseUnitTests-macOS.xctest */,
373+
84199A0E2947592D000D241B /* Parse.framework */,
374+
84199A102947592D000D241B /* Parse.framework */,
375+
84199A122947592D000D241B /* Parse.framework */,
376+
84199A142947592D000D241B /* Parse.framework */,
377+
84199A162947592D000D241B /* ParseUnitTests-iOS-host.app */,
378+
);
379+
name = Products;
380+
sourceTree = "<group>";
381+
};
289382
F52CD63A1B58383C0051AB86 /* Configurations */ = {
290383
isa = PBXGroup;
291384
children = (
@@ -403,6 +496,10 @@
403496
productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
404497
projectDirPath = "";
405498
projectReferences = (
499+
{
500+
ProductGroup = 841999F52947592D000D241B /* Products */;
501+
ProjectRef = 841999F42947592D000D241B /* Parse.xcodeproj */;
502+
},
406503
{
407504
ProductGroup = 7C5F7FBC29212AF10035B219 /* Products */;
408505
ProjectRef = 7C5F7FBB29212AF10035B219 /* ParseFacebookUtils.xcodeproj */;
@@ -445,6 +542,76 @@
445542
remoteRef = 7C5F7FDA29212AF20035B219 /* PBXContainerItemProxy */;
446543
sourceTree = BUILT_PRODUCTS_DIR;
447544
};
545+
84199A042947592D000D241B /* Parse.framework */ = {
546+
isa = PBXReferenceProxy;
547+
fileType = wrapper.framework;
548+
path = Parse.framework;
549+
remoteRef = 84199A032947592D000D241B /* PBXContainerItemProxy */;
550+
sourceTree = BUILT_PRODUCTS_DIR;
551+
};
552+
84199A062947592D000D241B /* Parse.framework */ = {
553+
isa = PBXReferenceProxy;
554+
fileType = wrapper.framework;
555+
path = Parse.framework;
556+
remoteRef = 84199A052947592D000D241B /* PBXContainerItemProxy */;
557+
sourceTree = BUILT_PRODUCTS_DIR;
558+
};
559+
84199A082947592D000D241B /* ParseUnitTests-iOS.xctest */ = {
560+
isa = PBXReferenceProxy;
561+
fileType = wrapper.cfbundle;
562+
path = "ParseUnitTests-iOS.xctest";
563+
remoteRef = 84199A072947592D000D241B /* PBXContainerItemProxy */;
564+
sourceTree = BUILT_PRODUCTS_DIR;
565+
};
566+
84199A0A2947592D000D241B /* Parse.framework */ = {
567+
isa = PBXReferenceProxy;
568+
fileType = wrapper.framework;
569+
path = Parse.framework;
570+
remoteRef = 84199A092947592D000D241B /* PBXContainerItemProxy */;
571+
sourceTree = BUILT_PRODUCTS_DIR;
572+
};
573+
84199A0C2947592D000D241B /* ParseUnitTests-macOS.xctest */ = {
574+
isa = PBXReferenceProxy;
575+
fileType = wrapper.cfbundle;
576+
path = "ParseUnitTests-macOS.xctest";
577+
remoteRef = 84199A0B2947592D000D241B /* PBXContainerItemProxy */;
578+
sourceTree = BUILT_PRODUCTS_DIR;
579+
};
580+
84199A0E2947592D000D241B /* Parse.framework */ = {
581+
isa = PBXReferenceProxy;
582+
fileType = wrapper.framework;
583+
path = Parse.framework;
584+
remoteRef = 84199A0D2947592D000D241B /* PBXContainerItemProxy */;
585+
sourceTree = BUILT_PRODUCTS_DIR;
586+
};
587+
84199A102947592D000D241B /* Parse.framework */ = {
588+
isa = PBXReferenceProxy;
589+
fileType = wrapper.framework;
590+
path = Parse.framework;
591+
remoteRef = 84199A0F2947592D000D241B /* PBXContainerItemProxy */;
592+
sourceTree = BUILT_PRODUCTS_DIR;
593+
};
594+
84199A122947592D000D241B /* Parse.framework */ = {
595+
isa = PBXReferenceProxy;
596+
fileType = wrapper.framework;
597+
path = Parse.framework;
598+
remoteRef = 84199A112947592D000D241B /* PBXContainerItemProxy */;
599+
sourceTree = BUILT_PRODUCTS_DIR;
600+
};
601+
84199A142947592D000D241B /* Parse.framework */ = {
602+
isa = PBXReferenceProxy;
603+
fileType = wrapper.framework;
604+
path = Parse.framework;
605+
remoteRef = 84199A132947592D000D241B /* PBXContainerItemProxy */;
606+
sourceTree = BUILT_PRODUCTS_DIR;
607+
};
608+
84199A162947592D000D241B /* ParseUnitTests-iOS-host.app */ = {
609+
isa = PBXReferenceProxy;
610+
fileType = wrapper.application;
611+
path = "ParseUnitTests-iOS-host.app";
612+
remoteRef = 84199A152947592D000D241B /* PBXContainerItemProxy */;
613+
sourceTree = BUILT_PRODUCTS_DIR;
614+
};
448615
/* End PBXReferenceProxy section */
449616

450617
/* Begin PBXResourcesBuildPhase section */
@@ -536,6 +703,7 @@
536703
isa = XCBuildConfiguration;
537704
baseConfigurationReference = 4AAEAA93200C026300AA7479 /* ParseFacebookUtilsTvOS-Dynamic.xcconfig */;
538705
buildSettings = {
706+
ARCHS = "$(ARCHS_STANDARD)";
539707
CLANG_ENABLE_MODULES = YES;
540708
CLANG_MODULES_AUTOLINK = YES;
541709
DEFINES_MODULE = YES;
@@ -556,6 +724,7 @@
556724
isa = XCBuildConfiguration;
557725
baseConfigurationReference = 4AAEAA93200C026300AA7479 /* ParseFacebookUtilsTvOS-Dynamic.xcconfig */;
558726
buildSettings = {
727+
ARCHS = "$(ARCHS_STANDARD)";
559728
CLANG_ENABLE_MODULES = YES;
560729
CLANG_MODULES_AUTOLINK = YES;
561730
DEFINES_MODULE = YES;
@@ -575,6 +744,7 @@
575744
isa = XCBuildConfiguration;
576745
baseConfigurationReference = 81FE7F721C1778FC00E6BD34 /* ParseFacebookUtilsTvOS.xcconfig */;
577746
buildSettings = {
747+
ARCHS = "$(ARCHS_STANDARD)";
578748
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
579749
SDKROOT = appletvos;
580750
TVOS_DEPLOYMENT_TARGET = 9.0;
@@ -585,6 +755,7 @@
585755
isa = XCBuildConfiguration;
586756
baseConfigurationReference = 81FE7F721C1778FC00E6BD34 /* ParseFacebookUtilsTvOS.xcconfig */;
587757
buildSettings = {
758+
ARCHS = "$(ARCHS_STANDARD)";
588759
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
589760
SDKROOT = appletvos;
590761
TVOS_DEPLOYMENT_TARGET = 9.0;

0 commit comments

Comments
 (0)