Skip to content

Commit 4d95c28

Browse files
committed
recite magical incantation to fix linker errors
1 parent 5ff4c2d commit 4d95c28

File tree

2 files changed

+111
-33
lines changed

2 files changed

+111
-33
lines changed

FirebaseUI.xcodeproj/project.pbxproj

Lines changed: 82 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
remoteGlobalIDString = 8D90842D1D9316AB00333CC8;
198198
remoteInfo = FirebaseStorageUI;
199199
};
200-
8DA941B81D67912000CD3685 /* PBXContainerItemProxy */ = {
200+
8D9FF4681E3829BA003FF6ED /* PBXContainerItemProxy */ = {
201201
isa = PBXContainerItemProxy;
202202
containerPortal = 8D2A849D1D678B2B0058DF04 /* Project object */;
203203
proxyType = 1;
@@ -1437,7 +1437,7 @@
14371437
buildRules = (
14381438
);
14391439
dependencies = (
1440-
8DA941B91D67912000CD3685 /* PBXTargetDependency */,
1440+
8D9FF4691E3829BA003FF6ED /* PBXTargetDependency */,
14411441
);
14421442
name = FirebaseGoogleAuthUI;
14431443
productName = FirebaseGoogleAuthUI;
@@ -2066,10 +2066,10 @@
20662066
target = 8D90842D1D9316AB00333CC8 /* FirebaseStorageUI */;
20672067
targetProxy = 8D9084381D9316AB00333CC8 /* PBXContainerItemProxy */;
20682068
};
2069-
8DA941B91D67912000CD3685 /* PBXTargetDependency */ = {
2069+
8D9FF4691E3829BA003FF6ED /* PBXTargetDependency */ = {
20702070
isa = PBXTargetDependency;
20712071
target = 8DCC4FC01D678CDC00B0D3C4 /* FirebaseAuthUI */;
2072-
targetProxy = 8DA941B81D67912000CD3685 /* PBXContainerItemProxy */;
2072+
targetProxy = 8D9FF4681E3829BA003FF6ED /* PBXContainerItemProxy */;
20732073
};
20742074
8DCC4FCD1D678CDC00B0D3C4 /* PBXTargetDependency */ = {
20752075
isa = PBXTargetDependency;
@@ -2978,6 +2978,45 @@
29782978
"-fstack-protector-all",
29792979
"-fobjc-arc",
29802980
);
2981+
OTHER_LDFLAGS = (
2982+
"$(inherited)",
2983+
"-ObjC",
2984+
"-l\"c++\"",
2985+
"-l\"sqlite3\"",
2986+
"-l\"z\"",
2987+
"-framework",
2988+
"\"AVFoundation\"",
2989+
"-framework",
2990+
"\"Accounts\"",
2991+
"-framework",
2992+
"\"AddressBook\"",
2993+
"-framework",
2994+
"\"CoreData\"",
2995+
"-framework",
2996+
"\"CoreGraphics\"",
2997+
"-framework",
2998+
"\"CoreMedia\"",
2999+
"-framework",
3000+
"\"CoreText\"",
3001+
"-framework",
3002+
"\"Fabric\"",
3003+
"-framework",
3004+
"\"QuartzCore\"",
3005+
"-framework",
3006+
"\"SafariServices\"",
3007+
"-framework",
3008+
"\"Security\"",
3009+
"-framework",
3010+
"\"Social\"",
3011+
"-framework",
3012+
"\"StoreKit\"",
3013+
"-framework",
3014+
"\"SystemConfiguration\"",
3015+
"-framework",
3016+
"\"TwitterCore\"",
3017+
"-framework",
3018+
"\"TwitterKit\"",
3019+
);
29813020
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseTwitterAuthUI;
29823021
PRODUCT_NAME = "$(TARGET_NAME)";
29833022
SKIP_INSTALL = YES;
@@ -3008,6 +3047,45 @@
30083047
"-fstack-protector-all",
30093048
"-fobjc-arc",
30103049
);
3050+
OTHER_LDFLAGS = (
3051+
"$(inherited)",
3052+
"-ObjC",
3053+
"-l\"c++\"",
3054+
"-l\"sqlite3\"",
3055+
"-l\"z\"",
3056+
"-framework",
3057+
"\"AVFoundation\"",
3058+
"-framework",
3059+
"\"Accounts\"",
3060+
"-framework",
3061+
"\"AddressBook\"",
3062+
"-framework",
3063+
"\"CoreData\"",
3064+
"-framework",
3065+
"\"CoreGraphics\"",
3066+
"-framework",
3067+
"\"CoreMedia\"",
3068+
"-framework",
3069+
"\"CoreText\"",
3070+
"-framework",
3071+
"\"Fabric\"",
3072+
"-framework",
3073+
"\"QuartzCore\"",
3074+
"-framework",
3075+
"\"SafariServices\"",
3076+
"-framework",
3077+
"\"Security\"",
3078+
"-framework",
3079+
"\"Social\"",
3080+
"-framework",
3081+
"\"StoreKit\"",
3082+
"-framework",
3083+
"\"SystemConfiguration\"",
3084+
"-framework",
3085+
"\"TwitterCore\"",
3086+
"-framework",
3087+
"\"TwitterKit\"",
3088+
);
30113089
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseTwitterAuthUI;
30123090
PRODUCT_NAME = "$(TARGET_NAME)";
30133091
SKIP_INSTALL = YES;

Podfile

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -31,47 +31,47 @@ target 'FirebaseAuthUI' do
3131
# Pods for Auth
3232
pod 'FirebaseAuth'
3333

34-
# Pod for FirebaseGoogleAuthUI (inlcuded to base so it's not duplicated)
35-
pod 'GoogleSignIn', '~> 4.0'
36-
3734
target 'FirebaseAuthUITests' do
3835
inherit! :search_paths
3936
end
37+
end
4038

41-
target 'FirebaseGoogleAuthUI' do
42-
inherit! :search_paths
43-
# Pods for Google Auth
44-
# pod 'GoogleSignIn', '~> 4.0'
45-
46-
target 'FirebaseGoogleAuthUITests' do
47-
inherit! :search_paths
48-
pod 'OCMock'
49-
end
50-
end
39+
target 'FirebaseFacebookAuthUI' do
40+
use_frameworks!
41+
inherit! :search_paths
42+
# Pods for Facebook Auth
43+
pod 'FBSDKLoginKit', '~> 4.0'
44+
pod 'FBSDKCoreKit', '~> 4.0'
5145

52-
target 'FirebaseFacebookAuthUI' do
46+
target 'FirebaseFacebookAuthUITests' do
5347
inherit! :search_paths
54-
# Pods for Facebook Auth
48+
pod 'OCMock'
5549
pod 'FBSDKLoginKit', '~> 4.0'
5650
pod 'FBSDKCoreKit', '~> 4.0'
57-
58-
target 'FirebaseFacebookAuthUITests' do
59-
inherit! :search_paths
60-
pod 'OCMock'
61-
pod 'FBSDKLoginKit', '~> 4.0'
62-
pod 'FBSDKCoreKit', '~> 4.0'
63-
end
6451
end
52+
end
6553

66-
target 'FirebaseTwitterAuthUI' do
54+
target 'FirebaseGoogleAuthUI' do
55+
use_frameworks!
56+
inherit! :search_paths
57+
# Pods for Google Auth
58+
pod 'GoogleSignIn', '~> 4.0'
59+
60+
target 'FirebaseGoogleAuthUITests' do
6761
inherit! :search_paths
68-
# Pods for Twitter Auth
69-
pod 'TwitterKit', '~> 2.4'
62+
pod 'OCMock'
63+
end
64+
end
7065

71-
target 'FirebaseTwitterAuthUITests' do
72-
inherit! :search_paths
73-
pod 'OCMock'
74-
end
66+
target 'FirebaseTwitterAuthUI' do
67+
use_frameworks!
68+
inherit! :search_paths
69+
# Pods for Twitter Auth
70+
pod 'TwitterKit', '~> 2.4'
71+
72+
target 'FirebaseTwitterAuthUITests' do
73+
inherit! :search_paths
74+
pod 'OCMock'
7575
end
7676
end
7777

0 commit comments

Comments
 (0)