BoltsFramework · drdaz · May 20, 2021 · May 20, 2021 · May 20, 2021 · May 21, 2021
diff --git a/.gitignore b/.gitignore
@@ -32,3 +32,5 @@ Carthage/Build
 
 ## AppCode
 .idea/
+.build
+.swiftpm
diff --git a/Bolts/iOS/BFAppLink.h → Bolts-iOS/BFAppLink.h b/Bolts/iOS/BFAppLink.h → Bolts-iOS/BFAppLink.h
@@ -8,6 +8,8 @@
  *
  */
 
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH && !TARGET_OS_TV
+
 #import <Foundation/Foundation.h>
 
 /*! The version of the App Link protocol that this library supports */
@@ -47,3 +49,5 @@ FOUNDATION_EXPORT NSString *const BFAppLinkVersion;
 @property (nonatomic, strong, readonly) NSURL *webURL;
 
 @end
+
+#endif
diff --git a/Bolts/iOS/BFAppLink.m → Bolts-iOS/BFAppLink.m b/Bolts/iOS/BFAppLink.m → Bolts-iOS/BFAppLink.m
@@ -8,6 +8,8 @@
  *
  */
 
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH && !TARGET_OS_TV
+
 #import "BFAppLink_Internal.h"
 
 NSString *const BFAppLinkDataParameterName = @"al_applink_data";
@@ -60,3 +62,6 @@ - (BFAppLink *)initWithIsBackToReferrer:(BOOL)backToReferrer {
 }
 
 @end
+
+
+#endif
diff --git a/Bolts/iOS/BFAppLinkNavigation.h → Bolts-iOS/BFAppLinkNavigation.h b/Bolts/iOS/BFAppLinkNavigation.h → Bolts-iOS/BFAppLinkNavigation.h
@@ -8,9 +8,11 @@
  *
  */
 
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH && !TARGET_OS_TV
+
 #import <Foundation/Foundation.h>
 
-#import <Bolts/BFAppLink.h>
+#import "BFAppLink.h"
 
 /*!
  The result of calling navigate on a BFAppLinkNavigation
@@ -112,3 +114,5 @@ NS_EXTENSION_UNAVAILABLE_IOS("Not available in app extension")
 + (void)setDefaultResolver:(id<BFAppLinkResolving>)resolver;
 
 @end
+
+#endif
diff --git a/Bolts/iOS/BFAppLinkNavigation.m → Bolts-iOS/BFAppLinkNavigation.m b/Bolts/iOS/BFAppLinkNavigation.m → Bolts-iOS/BFAppLinkNavigation.m
@@ -8,12 +8,21 @@
  *
  */
 
-#import "BFAppLinkNavigation.h"
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH && !TARGET_OS_TV
+
+#import <UIKit/UIKit.h>
 
+#if SWIFT_PACKAGE
+#import "../Bolts/Bolts.h"
+#else
 #import <Bolts/Bolts.h>
+#endif
 
+#import "BFAppLinkNavigation.h"
+#import "BFAppLinkTarget.h"
 #import "BFMeasurementEvent_Internal.h"
 #import "BFAppLink_Internal.h"
+#import "BFWebViewAppLinkResolver.h"
 
 FOUNDATION_EXPORT NSString *const BFAppLinkDataParameterName;
 FOUNDATION_EXPORT NSString *const BFAppLinkTargetKeyName;
@@ -282,3 +291,5 @@ + (void)setDefaultResolver:(id<BFAppLinkResolving>)resolver {
 }
 
 @end
+
+#endif
diff --git a/Bolts/iOS/BFAppLinkResolving.h → Bolts-iOS/BFAppLinkResolving.h b/Bolts/iOS/BFAppLinkResolving.h → Bolts-iOS/BFAppLinkResolving.h
@@ -8,6 +8,8 @@
  *
  */
 
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH && !TARGET_OS_TV
+
 #import <Foundation/Foundation.h>
 
 @class BFTask;
@@ -28,3 +30,5 @@
 - (BFTask *)appLinkFromURLInBackground:(NSURL *)url NS_EXTENSION_UNAVAILABLE_IOS("Not available in app extension");
 
 @end
+
+#endif
diff --git a/.../iOS/BFAppLinkReturnToRefererController.h → ...-iOS/BFAppLinkReturnToRefererController.h b/.../iOS/BFAppLinkReturnToRefererController.h → ...-iOS/BFAppLinkReturnToRefererController.h
@@ -8,10 +8,13 @@
  *
  */
 
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH && !TARGET_OS_TV
+
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
-#import <Bolts/BFAppLinkReturnToRefererView.h>
+
+#import "BFAppLinkReturnToRefererView.h"
 
 @class BFAppLink;
 @class BFAppLinkReturnToRefererController;
@@ -86,3 +89,5 @@ NS_EXTENSION_UNAVAILABLE_IOS("Not available in app extension")
 - (void)closeViewAnimated:(BOOL)animated;
 
 @end
+
+#endif
diff --git a/.../iOS/BFAppLinkReturnToRefererController.m → ...-iOS/BFAppLinkReturnToRefererController.m b/.../iOS/BFAppLinkReturnToRefererController.m → ...-iOS/BFAppLinkReturnToRefererController.m
@@ -8,6 +8,8 @@
  *
  */
 
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH && !TARGET_OS_TV
+
 #import "BFAppLinkReturnToRefererController.h"
 
 #import "BFAppLink.h"
@@ -228,3 +230,5 @@ - (void)openRefererAppLink:(BFAppLink *)refererAppLink {
 }
 
 @end
+
+#endif
diff --git a/Bolts/iOS/BFAppLinkReturnToRefererView.h → Bolts-iOS/BFAppLinkReturnToRefererView.h b/Bolts/iOS/BFAppLinkReturnToRefererView.h → Bolts-iOS/BFAppLinkReturnToRefererView.h
@@ -8,10 +8,13 @@
  *
  */
 
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH && !TARGET_OS_TV
+
 #import <Foundation/Foundation.h>
+
 #import <UIKit/UIKit.h>
 
-#import <Bolts/BFAppLinkNavigation.h>
+#import "BFAppLinkNavigation.h"
 
 @class BFAppLinkReturnToRefererView;
 @class BFURL;
@@ -76,3 +79,5 @@ NS_EXTENSION_UNAVAILABLE_IOS("Not available in app extension")
 @property (nonatomic, assign) BOOL closed;
 
 @end
+
+#endif
diff --git a/Bolts/iOS/BFAppLinkReturnToRefererView.m → Bolts-iOS/BFAppLinkReturnToRefererView.m b/Bolts/iOS/BFAppLinkReturnToRefererView.m → Bolts-iOS/BFAppLinkReturnToRefererView.m
@@ -8,6 +8,8 @@
  *
  */
 
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH && !TARGET_OS_TV
+
 #import "BFAppLinkReturnToRefererView.h"
 
 #import "BFAppLink.h"
@@ -244,7 +246,7 @@ - (NSString *)localizedLabelForReferer:(NSString *)refererName {
         return nil;
     }
 
-    NSString *format = NSLocalizedString(@"Touch to return to %1$@", @"Format for the string to return to a calling app.");
+    NSString *format = @"Touch to return to %1$@";
 
     return [NSString stringWithFormat:format, refererName];
 }
@@ -266,3 +268,5 @@ - (void)updateHidden {
 }
 
 @end
+
+#endif
diff --git a/...l/BFAppLinkReturnToRefererView_Internal.h → ...S/BFAppLinkReturnToRefererView_Internal.h b/...l/BFAppLinkReturnToRefererView_Internal.h → ...S/BFAppLinkReturnToRefererView_Internal.h
@@ -8,10 +8,14 @@
  *
  */
 
-#import <Bolts/BFAppLinkReturnToRefererView.h>
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH && !TARGET_OS_TV
+
+#import "BFAppLinkReturnToRefererView.h"
 
 @interface BFAppLinkReturnToRefererView (Internal)
 
 - (CGFloat)statusBarHeight;
 
 @end
+
+#endif
diff --git a/Bolts/iOS/BFAppLinkTarget.h → Bolts-iOS/BFAppLinkTarget.h b/Bolts/iOS/BFAppLinkTarget.h → Bolts-iOS/BFAppLinkTarget.h
@@ -8,6 +8,8 @@
  *
  */
 
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH && !TARGET_OS_TV
+
 #import <Foundation/Foundation.h>
 
 /*!
@@ -31,3 +33,5 @@
 @property (nonatomic, copy, readonly) NSString *appName;
 
 @end
+
+#endif
diff --git a/Bolts/iOS/BFAppLinkTarget.m → Bolts-iOS/BFAppLinkTarget.m b/Bolts/iOS/BFAppLinkTarget.m → Bolts-iOS/BFAppLinkTarget.m
@@ -8,6 +8,8 @@
  *
  */
 
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH && !TARGET_OS_TV
+
 #import "BFAppLinkTarget.h"
 
 @interface BFAppLinkTarget ()
@@ -31,3 +33,5 @@ + (instancetype)appLinkTargetWithURL:(NSURL *)url
 }
 
 @end
+
+#endif
diff --git a/Bolts/iOS/Internal/BFAppLink_Internal.h → Bolts-iOS/BFAppLink_Internal.h b/Bolts/iOS/Internal/BFAppLink_Internal.h → Bolts-iOS/BFAppLink_Internal.h
@@ -8,7 +8,9 @@
  *
  */
 
-#import <Bolts/BFAppLink.h>
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH && !TARGET_OS_TV
+
+#import "BFAppLink.h"
 
 FOUNDATION_EXPORT NSString *const BFAppLinkDataParameterName;
 FOUNDATION_EXPORT NSString *const BFAppLinkTargetKeyName;
@@ -30,3 +32,6 @@ FOUNDATION_EXPORT NSString *const BFAppLinkRefererUrl;
 @property (nonatomic, assign, readonly, getter=isBackToReferrer) BOOL backToReferrer;
 
 @end
+
+
+#endif
diff --git a/Bolts/iOS/BFMeasurementEvent.h → Bolts-iOS/BFMeasurementEvent.h b/Bolts/iOS/BFMeasurementEvent.h → Bolts-iOS/BFMeasurementEvent.h
@@ -8,6 +8,8 @@
  *
  */
 
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH && !TARGET_OS_TV
+
 #import <Foundation/Foundation.h>
 
 /*! The name of the notification posted by BFMeasurementEvent */
@@ -43,3 +45,5 @@ FOUNDATION_EXPORT NSString *const BFAppLinkNavigateBackToReferrerEventName;
 @interface BFMeasurementEvent : NSObject
 
 @end
+
+#endif
diff --git a/Bolts/iOS/BFMeasurementEvent.m → Bolts-iOS/BFMeasurementEvent.m b/Bolts/iOS/BFMeasurementEvent.m → Bolts-iOS/BFMeasurementEvent.m
@@ -8,6 +8,8 @@
  *
  */
 
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH && !TARGET_OS_TV
+
 #import "BFMeasurementEvent_Internal.h"
 
 NSString *const BFMeasurementEventNotificationName = @"com.parse.bolts.measurement_event";
@@ -23,7 +25,7 @@
 NSString *const BFAppLinkNavigateOutEventName = @"al_nav_out";
 NSString *const BFAppLinkNavigateBackToReferrerEventName = @"al_ref_back_out";
 
-__attribute__((noinline)) void warnOnMissingEventName() {
+__attribute__((noinline)) void warnOnMissingEventName(void) {
     NSLog(@"Warning: Missing event name when logging bolts measurement event. \n"
           " Ignoring this event in logging.");
 }
@@ -60,3 +62,5 @@ + (void)postNotificationForEventName:(NSString *)name args:(NSDictionary *)args
 }
 
 @end
+
+#endif
diff --git a/...OS/Internal/BFMeasurementEvent_Internal.h → Bolts-iOS/BFMeasurementEvent_Internal.h b/...OS/Internal/BFMeasurementEvent_Internal.h → Bolts-iOS/BFMeasurementEvent_Internal.h
@@ -8,7 +8,9 @@
  *
  */
 
-#import <Bolts/BFMeasurementEvent.h>
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH && !TARGET_OS_TV
+
+#import "BFMeasurementEvent.h"
 /*!
  Provides methods for posting notifications from the Bolts framework
  */
@@ -17,3 +19,5 @@
 + (void)postNotificationForEventName:(NSString *)name args:(NSDictionary *)args;
 
 @end
+
+#endif
diff --git a/Bolts/iOS/BFURL.h → Bolts-iOS/BFURL.h b/Bolts/iOS/BFURL.h → Bolts-iOS/BFURL.h
@@ -8,6 +8,8 @@
  *
  */
 
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH && !TARGET_OS_TV
+
 #import <Foundation/Foundation.h>
 
 @class BFAppLink;
@@ -73,3 +75,5 @@
 @property (nonatomic, strong, readonly) NSDictionary *inputQueryParameters;
 
 @end
+
+#endif
diff --git a/Bolts/iOS/BFURL.m → Bolts-iOS/BFURL.m b/Bolts/iOS/BFURL.m → Bolts-iOS/BFURL.m
@@ -8,6 +8,8 @@
  *
  */
 
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH && !TARGET_OS_TV
+
 #import "BFURL_Internal.h"
 #import "BFAppLink_Internal.h"
 #import "BFAppLinkTarget.h"
@@ -140,3 +142,5 @@ + (NSDictionary *)queryParametersForURL:(NSURL *)url {
 }
 
 @end
+
+#endif
diff --git a/Bolts/iOS/Internal/BFURL_Internal.h → Bolts-iOS/BFURL_Internal.h b/Bolts/iOS/Internal/BFURL_Internal.h → Bolts-iOS/BFURL_Internal.h
@@ -8,8 +8,12 @@
  *
  */
 
-#import <Bolts/BFURL.h>
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH && !TARGET_OS_TV
+
+#import "BFURL.h"
 
 @interface BFURL (Internal)
 + (BFURL *)URLForRenderBackToReferrerBarURL:(NSURL *)url;
 @end
+
+#endif
diff --git a/Bolts/iOS/BFWebViewAppLinkResolver.h → Bolts-iOS/BFWebViewAppLinkResolver.h b/Bolts/iOS/BFWebViewAppLinkResolver.h → Bolts-iOS/BFWebViewAppLinkResolver.h
@@ -8,9 +8,11 @@
  *
  */
 
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH && !TARGET_OS_TV
+
 #import <Foundation/Foundation.h>
 
-#import <Bolts/BFAppLinkResolving.h>
+#import "BFAppLinkResolving.h"
 
 /*!
  A reference implementation for an App Link resolver that uses a hidden WKWebView
@@ -25,3 +27,4 @@
 
 @end
 
+#endif
diff --git a/Bolts/iOS/BFWebViewAppLinkResolver.m → Bolts-iOS/BFWebViewAppLinkResolver.m b/Bolts/iOS/BFWebViewAppLinkResolver.m → Bolts-iOS/BFWebViewAppLinkResolver.m
@@ -8,14 +8,24 @@
  *
  */
 
-#import <WebKit/WebKit.h>
+#if TARGET_OS_IPHONE && !TARGET_OS_WATCH && !TARGET_OS_TV
 
+#import <WebKit/WebKit.h>
 #import "BFWebViewAppLinkResolver.h"
 #import "BFAppLink.h"
 #import "BFAppLinkTarget.h"
+
+#if SWIFT_PACKAGE
+#import "../Bolts/BFTask.h"
+#import "../Bolts/BFTaskCompletionSource.h"
+#import "../Bolts/BFExecutor.h"
+#else
 #import "BFTask.h"
 #import "BFTaskCompletionSource.h"
 #import "BFExecutor.h"
+#endif
+
+
 
 // Defines JavaScript to extract app link tags from HTML content
 static NSString *const BFWebViewAppLinkResolverTagExtractionJavaScript = @""
@@ -308,3 +318,5 @@ - (BFAppLink *)appLinkFromALData:(NSDictionary *)appLinkDict destination:(NSURL
 }
 
 @end
+
+#endif