Skip to content

[v6] fix xcode search paths #2080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

[v6] fix xcode search paths #2080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3adbe29
fix RNFBApp search paths
zerazeru Apr 26, 2019
92b5076
fix RNFBAnalytics search paths
zerazeru Apr 26, 2019
0951a6a
fix RNFBCrashlytics search paths
zerazeru Apr 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions packages/analytics/ios/RNFBAnalytics.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,10 +229,10 @@
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"${BUILT_PRODUCTS_DIR}/**",
"${SRCROOT}/../../../ios/Firebase/**",
"${SRCROOT}/../../../../ios/Firebase/**",
"$(FIREBASE_SEARCH_PATH)/Firebase/**",
"$(SRCROOT)/../../../ios/Pods/FirebaseAnalytics/Frameworks",
"$(SRCROOT)/../../../tests/ios/Pods/FirebaseAnalytics/Frameworks",
"$(SRCROOT)/../../../../ios/Pods/FirebaseAnalytics/Frameworks",
"$(SRCROOT)/../../../../tests/ios/Pods/FirebaseAnalytics/Frameworks",
);
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand All @@ -244,15 +244,15 @@
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(REACT_SEARCH_PATH)/React/**",
"$(SRCROOT)/../../react-native/React/**",
"$(SRCROOT)/../../react-native-firebase/ios/**",
"${SRCROOT}/../../../react-native/React/**",
"${SRCROOT}/../../../react-native-firebase/ios/**",
"$(FIREBASE_SEARCH_PATH)/Firebase/**",
"${SRCROOT}/../../../ios/Firebase/**",
"${SRCROOT}/../../../ios/Pods/Headers/Public/**",
"${SRCROOT}/../../../tests/ios/Pods/Headers/Public/**",
"$(SRCROOT)/../../../node_modules/react-native/React/**",
"$(SRCROOT)/../../../node_modules/react-native-firebase/ios/**",
"$(SRCROOT)/../../../packages/app/ios/**",
"${SRCROOT}/../../../../ios/Firebase/**",
"${SRCROOT}/../../../../ios/Pods/Headers/Public/**",
"${SRCROOT}/../../../../tests/ios/Pods/Headers/Public/**",
"$(SRCROOT)/../../../../node_modules/react-native/React/**",
"$(SRCROOT)/../../../../node_modules/react-native-firebase/ios/**",
"$(SRCROOT)/../../../../packages/app/ios/**",
);
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LIBRARY_SEARCH_PATHS = "$(inherited)";
Expand Down Expand Up @@ -288,9 +288,9 @@
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"${BUILT_PRODUCTS_DIR}/**",
"${SRCROOT}/../../../ios/Firebase/**",
"${SRCROOT}/../../../../ios/Firebase/**",
"$(FIREBASE_SEARCH_PATH)/Firebase/**",
"$(SRCROOT)/../../../ios/Pods/FirebaseAnalytics/Frameworks",
"$(SRCROOT)/../../../../ios/Pods/FirebaseAnalytics/Frameworks",
);
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand All @@ -302,15 +302,15 @@
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(REACT_SEARCH_PATH)/React/**",
"$(SRCROOT)/../../react-native/React/**",
"$(SRCROOT)/../../react-native-firebase/ios/**",
"${SRCROOT}/../../../react-native/React/**",
"${SRCROOT}/../../../react-native-firebase/ios/**",
"$(FIREBASE_SEARCH_PATH)/Firebase/**",
"${SRCROOT}/../../../ios/Firebase/**",
"${SRCROOT}/../../../ios/Pods/Headers/Public/**",
"${SRCROOT}/../../../tests/ios/Pods/Headers/Public/**",
"$(SRCROOT)/../../../node_modules/react-native/React/**",
"$(SRCROOT)/../../../node_modules/react-native-firebase/ios/**",
"$(SRCROOT)/../../../packages/app/ios/**",
"${SRCROOT}/../../../../ios/Firebase/**",
"${SRCROOT}/../../../../ios/Pods/Headers/Public/**",
"${SRCROOT}/../../../../tests/ios/Pods/Headers/Public/**",
"$(SRCROOT)/../../../../node_modules/react-native/React/**",
"$(SRCROOT)/../../../../node_modules/react-native-firebase/ios/**",
"$(SRCROOT)/../../../../packages/app/ios/**",
);
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LIBRARY_SEARCH_PATHS = "$(inherited)";
Expand Down
39 changes: 15 additions & 24 deletions packages/app/ios/RNFBApp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,10 +269,10 @@
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"${BUILT_PRODUCTS_DIR}/**",
"${SRCROOT}/../../../ios/Firebase/**",
"${SRCROOT}/../../../../ios/Firebase/**",
"$(FIREBASE_SEARCH_PATH)/Firebase/**",
"$(SRCROOT)/../../../ios/Pods/FirebaseCore/Frameworks",
"$(SRCROOT)/../../../tests/ios/Pods/FirebaseCore/Frameworks",
"$(SRCROOT)/../../../../ios/Pods/FirebaseCore/Frameworks",
"$(SRCROOT)/../../../../tests/ios/Pods/FirebaseCore/Frameworks",
);
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand All @@ -284,12 +284,12 @@
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(REACT_SEARCH_PATH)/React/**",
"$(SRCROOT)/../../react-native/React/**",
"${SRCROOT}/../../../react-native/React/**",
"$(FIREBASE_SEARCH_PATH)/Firebase/**",
"${SRCROOT}/../../../ios/Firebase/**",
"${SRCROOT}/../../../ios/Pods/Headers/Public/**",
"${SRCROOT}/../../../tests/ios/Pods/Headers/Public/**",
"$(SRCROOT)/../../../node_modules/react-native/React/**",
"${SRCROOT}/../../../../ios/Firebase/**",
"${SRCROOT}/../../../../ios/Pods/Headers/Public",
"${SRCROOT}/../../../../tests/ios/Pods/Headers/Public/**",
"${SRCROOT}/../../../../node_modules/react-native/React/**",
);
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LIBRARY_SEARCH_PATHS = "$(inherited)";
Expand Down Expand Up @@ -325,9 +325,9 @@
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"${BUILT_PRODUCTS_DIR}/**",
"${SRCROOT}/../../../ios/Firebase/**",
"${SRCROOT}/../../../../ios/Firebase/**",
"$(FIREBASE_SEARCH_PATH)/Firebase/**",
"$(SRCROOT)/../../../ios/Pods/FirebaseCore/Frameworks",
"$(SRCROOT)/../../../../ios/Pods/FirebaseCore/Frameworks",
);
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand All @@ -339,21 +339,12 @@
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(REACT_SEARCH_PATH)/React/**",
"$(SRCROOT)/../../react-native/React/**",
"${SRCROOT}/../../../react-native/React/**",
"$(FIREBASE_SEARCH_PATH)/Firebase/**",
"${SRCROOT}/../../../ios/Firebase/**",
"${SRCROOT}/../../../ios/Pods/Headers/Public/**",
"$(SRCROOT)/../../../node_modules/react-native/React/**",
"${SRCROOT}/../../../tests/ios/Pods/Headers/Public/**",
);
"HEADER_SEARCH_PATHS[arch=*]" = (
"$(inherited)",
"$(REACT_SEARCH_PATH)/React/**",
"$(SRCROOT)/../../react-native/React/**",
"$(FIREBASE_SEARCH_PATH)/Firebase/**",
"${SRCROOT}/../../../ios/Firebase/**",
"${SRCROOT}/../../../ios/Pods/Headers/Public/**",
"$(SRCROOT)/../../../node_modules/react-native/React/**",
"${SRCROOT}/../../../../ios/Firebase/**",
"${SRCROOT}/../../../../ios/Pods/Headers/Public",
"${SRCROOT}/../../../../node_modules/react-native/React/**",
"${SRCROOT}/../../../../tests/ios/Pods/Headers/Public/**",
);
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LIBRARY_SEARCH_PATHS = "$(inherited)";
Expand Down
2 changes: 1 addition & 1 deletion packages/app/ios/RNFBApp/RNFBSharedUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#define RNFBSharedUtils_h

#import <FirebaseCore/FirebaseCore.h>
#import "RCTBridgeModule.h"
#import <React/RCTBridgeModule.h>

#ifdef DEBUG
#define DLog(fmt, ...) NSLog((@"%s [Line %d] " fmt), __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__);
Expand Down
46 changes: 25 additions & 21 deletions packages/crashlytics/ios/RNFBCrashlytics.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,10 +233,10 @@
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"${BUILT_PRODUCTS_DIR}/**",
"${SRCROOT}/../../../ios/Firebase/**",
"${SRCROOT}/../../../../ios/Firebase/**",
"$(FIREBASE_SEARCH_PATH)/Firebase/**",
"$(SRCROOT)/../../../ios/Pods/FirebaseCrashlytics/Frameworks",
"$(SRCROOT)/../../../tests/ios/Pods/FirebaseCrashlytics/Frameworks",
"$(SRCROOT)/../../../../ios/Pods/FirebaseCrashlytics/Frameworks",
"$(SRCROOT)/../../../../tests/ios/Pods/FirebaseCrashlytics/Frameworks",
);
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand All @@ -248,15 +248,17 @@
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(REACT_SEARCH_PATH)/React/**",
"$(SRCROOT)/../../react-native/React/**",
"$(SRCROOT)/../../react-native-firebase/ios/**",
"$(SRCROOT)/../../../react-native/React/**",
"$(SRCROOT)/../../../react-native-firebase/ios/**",
"$(FIREBASE_SEARCH_PATH)/Firebase/**",
"${SRCROOT}/../../../ios/Firebase/**",
"${SRCROOT}/../../../ios/Pods/Headers/Public/**",
"${SRCROOT}/../../../tests/ios/Pods/Headers/Public/**",
"$(SRCROOT)/../../../node_modules/react-native/React/**",
"$(SRCROOT)/../../../node_modules/react-native-firebase/ios/**",
"$(SRCROOT)/../../../packages/app/ios/**",
"$(SRCROOT)/../../../../ios/Firebase/**",
"$(SRCROOT)/../../../../ios/Pods/Headers/Public/**",
"$(SRCROOT)/../../../../ios/Pods/Crashlytics/iOS/Crashlytics.framework/Headers",
"$(SRCROOT)/../../../../ios/Pods/Fabric/iOS/Fabric.framework/Headers",
"$(SRCROOT)/../../../../tests/ios/Pods/Headers/Public/**",
"$(SRCROOT)/../../../../node_modules/react-native/React/**",
"$(SRCROOT)/../../../../node_modules/react-native-firebase/ios/**",
"$(SRCROOT)/../../../../packages/app/ios/**",
);
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LIBRARY_SEARCH_PATHS = "$(inherited)";
Expand Down Expand Up @@ -292,9 +294,9 @@
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"${BUILT_PRODUCTS_DIR}/**",
"${SRCROOT}/../../../ios/Firebase/**",
"${SRCROOT}/../../../../ios/Firebase/**",
"$(FIREBASE_SEARCH_PATH)/Firebase/**",
"$(SRCROOT)/../../../ios/Pods/FirebaseCrashlytics/Frameworks",
"$(SRCROOT)/../../../../ios/Pods/FirebaseCrashlytics/Frameworks",
);
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand All @@ -306,15 +308,17 @@
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(REACT_SEARCH_PATH)/React/**",
"$(SRCROOT)/../../react-native/React/**",
"$(SRCROOT)/../../react-native-firebase/ios/**",
"$(SRCROOT)/../../../react-native/React/**",
"$(SRCROOT)/../../../react-native-firebase/ios/**",
"$(FIREBASE_SEARCH_PATH)/Firebase/**",
"${SRCROOT}/../../../ios/Firebase/**",
"${SRCROOT}/../../../ios/Pods/Headers/Public/**",
"${SRCROOT}/../../../tests/ios/Pods/Headers/Public/**",
"$(SRCROOT)/../../../node_modules/react-native/React/**",
"$(SRCROOT)/../../../node_modules/react-native-firebase/ios/**",
"$(SRCROOT)/../../../packages/app/ios/**",
"$(SRCROOT)/../../../../ios/Firebase/**",
"$(SRCROOT)/../../../../ios/Pods/Headers/Public/**",
"$(SRCROOT)/../../../../ios/Pods/Crashlytics/iOS/Crashlytics.framework/Headers",
"$(SRCROOT)/../../../../ios/Pods/Fabric/iOS/Fabric.framework/Headers",
"$(SRCROOT)/../../../../tests/ios/Pods/Headers/Public/**",
"$(SRCROOT)/../../../../node_modules/react-native/React/**",
"$(SRCROOT)/../../../../node_modules/react-native-firebase/ios/**",
"$(SRCROOT)/../../../../packages/app/ios/**",
);
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
LIBRARY_SEARCH_PATHS = "$(inherited)";
Expand Down