Fixed issue 192 (BoltsFramework#192), allowing projects that include …

…frameworks which themselves include Bolts to work without running into “Include of non-modular header inside framework module” compilation errors.
marchy · Oct 31, 2015 · 54333b3 · 54333b3
1 parent a523b10
commit 54333b3
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 37 deletions.
diff --git a/Bolts.xcodeproj/project.pbxproj b/Bolts.xcodeproj/project.pbxproj
@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		0937F9431BE577F1008C38BA /* BFAppLinkNavigationType.h in Headers */ = {isa = PBXBuildFile; fileRef = 0937F9401BE576BE008C38BA /* BFAppLinkNavigationType.h */; };
+		0937F9441BE577F1008C38BA /* BFAppLinkReturnToRefererViewDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 0937F93F1BE575FF008C38BA /* BFAppLinkReturnToRefererViewDelegate.h */; };
 		1E9BF8DC18EA0CAD00514B1E /* test.html in Resources */ = {isa = PBXBuildFile; fileRef = 1E9BF8DB18EA0CAD00514B1E /* test.html */; };
 		1EC3016118CDAA8400D06D07 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8E9C3CEC17DE9DE000427E62 /* Foundation.framework */; };
 		1EC3016318CDAA8400D06D07 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1EC3016218CDAA8400D06D07 /* CoreGraphics.framework */; };
@@ -155,6 +157,8 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		0937F93F1BE575FF008C38BA /* BFAppLinkReturnToRefererViewDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BFAppLinkReturnToRefererViewDelegate.h; sourceTree = "<group>"; };
+		0937F9401BE576BE008C38BA /* BFAppLinkNavigationType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BFAppLinkNavigationType.h; sourceTree = "<group>"; };
 		1E9BF8DB18EA0CAD00514B1E /* test.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = test.html; sourceTree = "<group>"; };
 		1EC3016018CDAA8400D06D07 /* BoltsTestUI.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BoltsTestUI.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		1EC3016218CDAA8400D06D07 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -371,13 +375,15 @@
 				8103FA5A19900A84000BAE3F /* BFAppLinkNavigation.h */,
 				8103FA5B19900A84000BAE3F /* BFAppLinkNavigation.m */,
 				8103FA5C19900A84000BAE3F /* BFAppLinkResolving.h */,
+				0937F9401BE576BE008C38BA /* BFAppLinkNavigationType.h */,
 				8103FA6619900A84000BAE3F /* BFWebViewAppLinkResolver.h */,
 				8103FA6719900A84000BAE3F /* BFWebViewAppLinkResolver.m */,
 				8103FA5D19900A84000BAE3F /* BFAppLinkReturnToRefererController.h */,
 				8103FA5E19900A84000BAE3F /* BFAppLinkReturnToRefererController.m */,
 				8103FA5F19900A84000BAE3F /* BFAppLinkReturnToRefererView.h */,
 				8103FA6019900A84000BAE3F /* BFAppLinkReturnToRefererView.m */,
 				8103FA6119900A84000BAE3F /* BFAppLinkReturnToRefererView_Internal.h */,
+				0937F93F1BE575FF008C38BA /* BFAppLinkReturnToRefererViewDelegate.h */,
 				8103FA6219900A84000BAE3F /* BFAppLinkTarget.h */,
 				8103FA6319900A84000BAE3F /* BFAppLinkTarget.m */,
 				B242FAC019A599CD0097ECAE /* BFMeasurementEvent_Internal.h */,
@@ -592,6 +598,8 @@
 				81ED943A1BE1481900795F05 /* BFMeasurementEvent_Internal.h in Headers */,
 				81ED943B1BE1481900795F05 /* BFMeasurementEvent.h in Headers */,
 				81ED942B1BE1481900795F05 /* BFAppLink_Internal.h in Headers */,
+				0937F9431BE577F1008C38BA /* BFAppLinkNavigationType.h in Headers */,
+				0937F9441BE577F1008C38BA /* BFAppLinkReturnToRefererViewDelegate.h in Headers */,
 				81ED94241BE147CF00795F05 /* Bolts.h in Headers */,
 				81ED94251BE147CF00795F05 /* BFCancellationToken.h in Headers */,
 				81ED942C1BE1481900795F05 /* BFAppLink.h in Headers */,

diff --git a/Bolts/Common/BFCancellationToken.h b/Bolts/Common/BFCancellationToken.h
@@ -10,7 +10,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <Bolts/BFCancellationTokenRegistration.h>
+@class BFCancellationTokenRegistration;
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/Bolts/Common/Bolts.h b/Bolts/Common/Bolts.h
@@ -8,7 +8,6 @@
  *
  */
 
-#import <Bolts/BoltsVersion.h>
 #import <Bolts/BFCancellationToken.h>
 #import <Bolts/BFCancellationTokenRegistration.h>
 #import <Bolts/BFCancellationTokenSource.h>

diff --git a/Bolts/Common/Bolts.m b/Bolts/Common/Bolts.m
@@ -9,6 +9,7 @@
  */
 
 #import "Bolts.h"
+#import "BoltsVersion.h"
 
 NSInteger const kBFMultipleErrorsError = 80175001;
 

diff --git a/Bolts/iOS/BFAppLinkNavigation.h b/Bolts/iOS/BFAppLinkNavigation.h
@@ -9,20 +9,8 @@
  */
 
 #import <Foundation/Foundation.h>
-
 #import <Bolts/BFAppLink.h>
-
-/*!
- The result of calling navigate on a BFAppLinkNavigation
- */
-typedef NS_ENUM(NSInteger, BFAppLinkNavigationType) {
-    /*! Indicates that the navigation failed and no app was opened */
-    BFAppLinkNavigationTypeFailure,
-    /*! Indicates that the navigation succeeded by opening the URL in the browser */
-    BFAppLinkNavigationTypeBrowser,
-    /*! Indicates that the navigation succeeded by opening the URL in an app on the device */
-    BFAppLinkNavigationTypeApp
-};
+#import <Bolts/BFAppLinkNavigationType.h>
 
 @protocol BFAppLinkResolving;
 @class BFTask;

diff --git a/Bolts/iOS/BFAppLinkNavigationType.h b/Bolts/iOS/BFAppLinkNavigationType.h
@@ -0,0 +1,19 @@
+//
+//  BFAppLinkNavigationType.h
+//  Bolts
+//
+//  Created by Marcel Bradea on 2015-10-31.
+//  Copyright © 2015 Parse Inc. All rights reserved.
+//
+
+/*!
+ The result of calling navigate on a BFAppLinkNavigation
+ */
+typedef NS_ENUM(NSInteger, BFAppLinkNavigationType) {
+    /*! Indicates that the navigation failed and no app was opened */
+    BFAppLinkNavigationTypeFailure,
+    /*! Indicates that the navigation succeeded by opening the URL in the browser */
+    BFAppLinkNavigationTypeBrowser,
+    /*! Indicates that the navigation succeeded by opening the URL in an app on the device */
+    BFAppLinkNavigationTypeApp
+};
diff --git a/Bolts/iOS/BFAppLinkReturnToRefererController.h b/Bolts/iOS/BFAppLinkReturnToRefererController.h
@@ -10,9 +10,10 @@
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
+#import <Bolts/BFAppLinkReturnToRefererViewDelegate.h>
+#import <Bolts/BFAppLinkNavigationType.h>
 
-#import <Bolts/BFAppLinkReturnToRefererView.h>
-
+@class BFAppLinkReturnToRefererView;
 @class BFAppLink;
 @class BFAppLinkReturnToRefererController;
 

diff --git a/Bolts/iOS/BFAppLinkReturnToRefererController.m b/Bolts/iOS/BFAppLinkReturnToRefererController.m
@@ -9,7 +9,7 @@
  */
 
 #import "BFAppLinkReturnToRefererController.h"
-
+#import "BFAppLinkReturnToRefererView.h"
 #import "BFAppLink.h"
 #import "BFAppLinkReturnToRefererView_Internal.h"
 #import "BFURL_Internal.h"

diff --git a/Bolts/iOS/BFAppLinkReturnToRefererView.h b/Bolts/iOS/BFAppLinkReturnToRefererView.h
@@ -13,6 +13,8 @@
 
 #import <Bolts/BFAppLinkNavigation.h>
 
+#import "BFAppLinkReturnToRefererViewDelegate.h"
+
 @class BFAppLinkReturnToRefererView;
 @class BFURL;
 
@@ -22,25 +24,6 @@ typedef NS_ENUM(NSUInteger, BFIncludeStatusBarInSize) {
     BFIncludeStatusBarInSizeAlways,
 };
 
-/*!
- Protocol that a class can implement in order to be notified when the user has navigated back
- to the referer of an App Link.
- */
-@protocol BFAppLinkReturnToRefererViewDelegate <NSObject>
-
-/*!
- Called when the user has tapped inside the close button.
- */
-- (void)returnToRefererViewDidTapInsideCloseButton:(BFAppLinkReturnToRefererView *)view;
-
-/*!
- Called when the user has tapped inside the App Link portion of the view.
- */
-- (void)returnToRefererViewDidTapInsideLink:(BFAppLinkReturnToRefererView *)view
-                                       link:(BFAppLink *)link;
-
-@end
-
 /*!
  Provides a UIView that displays a button allowing users to navigate back to the
  application that launched the App Link currently being handled, if the App Link

diff --git a/Bolts/iOS/BFAppLinkReturnToRefererViewDelegate.h b/Bolts/iOS/BFAppLinkReturnToRefererViewDelegate.h
@@ -0,0 +1,29 @@
+//
+//  BFAppLinkReturnToRefererViewDelegate.h
+//  Bolts
+//
+//  Created by Marcel Bradea on 2015-10-31.
+//  Copyright © 2015 Parse Inc. All rights reserved.
+//
+
+@class BFAppLinkReturnToRefererView;
+@class BFAppLink;
+
+/*!
+ Protocol that a class can implement in order to be notified when the user has navigated back
+ to the referer of an App Link.
+ */
+@protocol BFAppLinkReturnToRefererViewDelegate <NSObject>
+
+/*!
+ Called when the user has tapped inside the close button.
+ */
+- (void)returnToRefererViewDidTapInsideCloseButton:(BFAppLinkReturnToRefererView *)view;
+
+/*!
+ Called when the user has tapped inside the App Link portion of the view.
+ */
+- (void)returnToRefererViewDidTapInsideLink:(BFAppLinkReturnToRefererView *)view
+                                       link:(BFAppLink *)link;
+
+@end
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ @@
      */
     #import "Bolts.h"
+    #import "BoltsVersion.h"
     NSInteger const kBFMultipleErrorsError = 80175001;
@@ Expand Down @@