Skip to content

Commit

Permalink
Merge pull request #290 from Microsoft/fix/recursive-header-error
Browse files Browse the repository at this point in the history 
Fix recursive header expansion error
  • Loading branch information
@dhei
dhei authored Apr 27, 2018
2 parents ad02dbd + 0753f8d commit 0b9407c
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 16 deletions.
20 changes: 16 additions & 4 deletions appcenter-analytics/ios/AppCenterReactNativeAnalytics.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,10 +232,16 @@
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(SRCROOT)/../../../ios/Vendor/**",
"$(SRCROOT)/../../../ios/Pods/**",
"$(SRCROOT)/../../../ios/Pods/AppCenter/**",
"$(SRCROOT)/../../../ios/Pods/AppCenterReactNativeShared/**",
"$(inherited)",
);
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../react-native/React/**";
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../react-native/React/Base",
"$(SRCROOT)/../../react-native/React/Modules",
"$(SRCROOT)/../../react-native/React/CSSLayout",
"$(SRCROOT)/../../react-native/React/Views",
);
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -249,10 +255,16 @@
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(SRCROOT)/../../../ios/Vendor/**",
"$(SRCROOT)/../../../ios/Pods/**",
"$(SRCROOT)/../../../ios/Pods/AppCenter/**",
"$(SRCROOT)/../../../ios/Pods/AppCenterReactNativeShared/**",
"$(inherited)",
);
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../react-native/React/**";
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../react-native/React/Base",
"$(SRCROOT)/../../react-native/React/Modules",
"$(SRCROOT)/../../react-native/React/CSSLayout",
"$(SRCROOT)/../../react-native/React/Views",
);
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
20 changes: 16 additions & 4 deletions appcenter-crashes/ios/AppCenterReactNativeCrashes.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,10 +246,16 @@
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../../../ios/Pods/**",
"$(SRCROOT)/../../../ios/Pods/AppCenter/**",
"$(SRCROOT)/../../../ios/Pods/AppCenterReactNativeShared/**",
"$(SRCROOT)/../../../ios/Vendor/**",
);
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../react-native/React/**";
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../react-native/React/Base",
"$(SRCROOT)/../../react-native/React/Modules",
"$(SRCROOT)/../../react-native/React/CSSLayout",
"$(SRCROOT)/../../react-native/React/Views",
);
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = AppCenterReactNativeCrashes;
Expand All @@ -262,10 +268,16 @@
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../../../ios/Pods/**",
"$(SRCROOT)/../../../ios/Pods/AppCenter/**",
"$(SRCROOT)/../../../ios/Pods/AppCenterReactNativeShared/**",
"$(SRCROOT)/../../../ios/Vendor/**",
);
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../react-native/React/**";
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../react-native/React/Base",
"$(SRCROOT)/../../react-native/React/Modules",
"$(SRCROOT)/../../react-native/React/CSSLayout",
"$(SRCROOT)/../../react-native/React/Views",
);
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = AppCenterReactNativeCrashes;
Expand Down
20 changes: 16 additions & 4 deletions appcenter-push/ios/AppCenterReactNativePush.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,10 +249,16 @@
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../../../ios/Pods/**",
"$(SRCROOT)/../../../ios/Pods/AppCenter/**",
"$(SRCROOT)/../../../ios/Pods/AppCenterReactNativeShared/**",
"$(SRCROOT)/../../../ios/Vendor/**",
);
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../react-native/React/**";
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../react-native/React/Base",
"$(SRCROOT)/../../react-native/React/Modules",
"$(SRCROOT)/../../react-native/React/CSSLayout",
"$(SRCROOT)/../../react-native/React/Views",
);
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -265,10 +271,16 @@
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../../../ios/Pods/**",
"$(SRCROOT)/../../../ios/Pods/AppCenter/**",
"$(SRCROOT)/../../../ios/Pods/AppCenterReactNativeShared/**",
"$(SRCROOT)/../../../ios/Vendor/**",
);
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../react-native/React/**";
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../react-native/React/Base",
"$(SRCROOT)/../../react-native/React/Modules",
"$(SRCROOT)/../../react-native/React/CSSLayout",
"$(SRCROOT)/../../react-native/React/Views",
);
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
20 changes: 16 additions & 4 deletions appcenter/ios/AppCenterReactNative.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,10 +233,16 @@
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(SRCROOT)/../../../ios/Vendor/**",
"$(SRCROOT)/../../../ios/Pods/**",
"$(SRCROOT)/../../../ios/Pods/AppCenter/**",
"$(SRCROOT)/../../../ios/Pods/AppCenterReactNativeShared/**",
"$(inherited)",
);
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../react-native/React/**";
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../react-native/React/Base",
"$(SRCROOT)/../../react-native/React/Modules",
"$(SRCROOT)/../../react-native/React/CSSLayout",
"$(SRCROOT)/../../react-native/React/Views",
);
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -249,10 +255,16 @@
buildSettings = {
FRAMEWORK_SEARCH_PATHS = (
"$(SRCROOT)/../../../ios/Vendor/**",
"$(SRCROOT)/../../../ios/Pods/**",
"$(SRCROOT)/../../../ios/Pods/AppCenter/**",
"$(SRCROOT)/../../../ios/Pods/AppCenterReactNativeShared/**",
"$(inherited)",
);
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../react-native/React/**";
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../react-native/React/Base",
"$(SRCROOT)/../../react-native/React/Modules",
"$(SRCROOT)/../../react-native/React/CSSLayout",
"$(SRCROOT)/../../react-native/React/Views",
);
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down

0 comments on commit 0b9407c

Please sign in to comment.