Skip to content

Commit 74f89d1

Browse files
authored
Merge pull request #181 from morganchen12/pods-workaround
work around pods duplicate classes in tests runtime
2 parents 5305e2d + 4912ea5 commit 74f89d1

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

FirebaseUI.xcodeproj/project.pbxproj

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2361,10 +2361,7 @@
23612361
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
23622362
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(BUILT_PRODUCTS_DIR)/SDWebImage";
23632363
LIBRARY_SEARCH_PATHS = "";
2364-
OTHER_LDFLAGS = (
2365-
"$(inherited)",
2366-
"-ObjC",
2367-
);
2364+
OTHER_LDFLAGS = "-ObjC";
23682365
PRODUCT_BUNDLE_IDENTIFIER = com.firebaseui.FirebaseStorageUITests;
23692366
PRODUCT_NAME = "$(TARGET_NAME)";
23702367
};
@@ -2380,10 +2377,7 @@
23802377
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
23812378
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(BUILT_PRODUCTS_DIR)";
23822379
LIBRARY_SEARCH_PATHS = "";
2383-
OTHER_LDFLAGS = (
2384-
"$(inherited)",
2385-
"-ObjC",
2386-
);
2380+
OTHER_LDFLAGS = "-ObjC";
23872381
PRODUCT_BUNDLE_IDENTIFIER = com.firebaseui.FirebaseStorageUITests;
23882382
PRODUCT_NAME = "$(TARGET_NAME)";
23892383
};
@@ -2545,6 +2539,7 @@
25452539
INFOPLIST_FILE = FirebaseDatabaseUITests/Info.plist;
25462540
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
25472541
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
2542+
OTHER_LDFLAGS = "-ObjC";
25482543
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseDatabaseUITests;
25492544
PRODUCT_NAME = "$(TARGET_NAME)";
25502545
};
@@ -2566,6 +2561,7 @@
25662561
INFOPLIST_FILE = FirebaseDatabaseUITests/Info.plist;
25672562
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
25682563
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
2564+
OTHER_LDFLAGS = "-ObjC";
25692565
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseDatabaseUITests;
25702566
PRODUCT_NAME = "$(TARGET_NAME)";
25712567
};
@@ -2624,6 +2620,7 @@
26242620
INFOPLIST_FILE = FirebaseAuthUITests/Info.plist;
26252621
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
26262622
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
2623+
OTHER_LDFLAGS = "-ObjC";
26272624
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseAuthUITests;
26282625
PRODUCT_NAME = "$(TARGET_NAME)";
26292626
};
@@ -2646,6 +2643,7 @@
26462643
INFOPLIST_FILE = FirebaseAuthUITests/Info.plist;
26472644
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
26482645
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
2646+
OTHER_LDFLAGS = "-ObjC";
26492647
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseAuthUITests;
26502648
PRODUCT_NAME = "$(TARGET_NAME)";
26512649
};
@@ -2722,6 +2720,7 @@
27222720
INFOPLIST_FILE = FirebaseFacebookAuthUITests/Info.plist;
27232721
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
27242722
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks ${BUILT_PRODUCTS_DIR}/Bolts ${BUILT_PRODUCTS_DIR}/FBSDKCoreKit ${BUILT_PRODUCTS_DIR}/FBSDKLoginKit";
2723+
OTHER_LDFLAGS = "-ObjC";
27252724
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseFacebookAuthUITests;
27262725
PRODUCT_NAME = "$(TARGET_NAME)";
27272726
};
@@ -2746,6 +2745,7 @@
27462745
INFOPLIST_FILE = FirebaseFacebookAuthUITests/Info.plist;
27472746
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
27482747
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks ${BUILT_PRODUCTS_DIR}/Bolts ${BUILT_PRODUCTS_DIR}/FBSDKCoreKit ${BUILT_PRODUCTS_DIR}/FBSDKLoginKit";
2748+
OTHER_LDFLAGS = "-ObjC";
27492749
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseFacebookAuthUITests;
27502750
PRODUCT_NAME = "$(TARGET_NAME)";
27512751
};
@@ -2825,6 +2825,7 @@
28252825
"-iquote",
28262826
"\"$PODS_CONFIGURATION_BUILD_DIR/OCMock/OCMock.framework/Headers\"",
28272827
);
2828+
OTHER_LDFLAGS = "-ObjC";
28282829
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseGoogleAuthUITests;
28292830
PRODUCT_NAME = "$(TARGET_NAME)";
28302831
};
@@ -2848,6 +2849,7 @@
28482849
"-iquote",
28492850
"\"$PODS_CONFIGURATION_BUILD_DIR/OCMock/OCMock.framework/Headers\"",
28502851
);
2852+
OTHER_LDFLAGS = "-ObjC";
28512853
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseGoogleAuthUITests;
28522854
PRODUCT_NAME = "$(TARGET_NAME)";
28532855
};
@@ -2916,6 +2918,7 @@
29162918
INFOPLIST_FILE = FirebaseTwitterAuthUITests/Info.plist;
29172919
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
29182920
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
2921+
OTHER_LDFLAGS = "-ObjC";
29192922
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseTwitterAuthUITests;
29202923
PRODUCT_NAME = "$(TARGET_NAME)";
29212924
};
@@ -2934,6 +2937,7 @@
29342937
INFOPLIST_FILE = FirebaseTwitterAuthUITests/Info.plist;
29352938
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
29362939
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
2940+
OTHER_LDFLAGS = "-ObjC";
29372941
PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseTwitterAuthUITests;
29382942
PRODUCT_NAME = "$(TARGET_NAME)";
29392943
};

0 commit comments

Comments
 (0)