Move Dynamic Links to API_UNAVAILABLE (#8467)

* Move Dynamic Links to API_UNAVAILABLE

* Add changelog

Author: morganchen12

FirebaseDynamicLinks/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v8.6.0
+- [changed] Replaced conditionally-compiled APIs with `API_UNAVAILABLE` annotations on unsupported platforms (#8467).
+
 # v8.4.0
 - [fixed] Fixed build issues introduced in Xcode 13 beta 3. (#8401)
 - [fixed] Fixed build failures for extension targets. (#6548)

FirebaseDynamicLinks/Sources/Public/FirebaseDynamicLinks/FDLURLComponents.h

@@ -16,16 +16,6 @@
 
 #import <Foundation/Foundation.h>
 
-// NS_SWIFT_NAME can only translate factory methods before the iOS 9.3 SDK.
-// Wrap it in our own macro if it's a non-compatible SDK.
-#ifndef FIR_SWIFT_NAME
-#ifdef __IPHONE_9_3
-#define FIR_SWIFT_NAME(X) NS_SWIFT_NAME(X)
-#else
-#define FIR_SWIFT_NAME(X)  // Intentionally blank.
-#endif                     // #ifdef __IPHONE_9_3
-#endif                     // #ifndef FIR_SWIFT_NAME
-
 NS_ASSUME_NONNULL_BEGIN
 
 /**
@@ -40,7 +30,7 @@ typedef NS_ENUM(NSInteger, FIRShortDynamicLinkPathLength) {
   FIRShortDynamicLinkPathLengthShort,
   /** Short link with an extra long path for great difficulty in guessing. */
   FIRShortDynamicLinkPathLengthUnguessable,
-} FIR_SWIFT_NAME(ShortDynamicLinkPathLength);
+} NS_SWIFT_NAME(ShortDynamicLinkPathLength);
 
 /**
  * @abstract The definition of the completion block used by URL shortener.
@@ -53,13 +43,13 @@ typedef NS_ENUM(NSInteger, FIRShortDynamicLinkPathLength) {
 typedef void (^FIRDynamicLinkShortenerCompletion)(NSURL *_Nullable shortURL,
                                                   NSArray<NSString *> *_Nullable warnings,
                                                   NSError *_Nullable error)
-    FIR_SWIFT_NAME(DynamicLinkShortenerCompletion);
+    NS_SWIFT_NAME(DynamicLinkShortenerCompletion);
 
 /**
  * @class FIRDynamicLinkGoogleAnalyticsParameters
  * @abstract The Dynamic Link analytics parameters.
  */
-FIR_SWIFT_NAME(DynamicLinkGoogleAnalyticsParameters)
+NS_SWIFT_NAME(DynamicLinkGoogleAnalyticsParameters)
 @interface FIRDynamicLinkGoogleAnalyticsParameters : NSObject
 
 /**
@@ -138,7 +128,7 @@ FIR_SWIFT_NAME(DynamicLinkGoogleAnalyticsParameters)
  * @class FIRDynamicLinkIOSParameters
  * @abstract The Dynamic Link iOS parameters.
  */
-FIR_SWIFT_NAME(DynamicLinkIOSParameters)
+NS_SWIFT_NAME(DynamicLinkIOSParameters)
 @interface FIRDynamicLinkIOSParameters : NSObject
 
 /**
@@ -214,7 +204,7 @@ FIR_SWIFT_NAME(DynamicLinkIOSParameters)
  * @class FIRDynamicLinkItunesConnectAnalyticsParameters
  * @abstract The Dynamic Link iTunes Connect parameters.
  */
-FIR_SWIFT_NAME(DynamicLinkItunesConnectAnalyticsParameters)
+NS_SWIFT_NAME(DynamicLinkItunesConnectAnalyticsParameters)
 @interface FIRDynamicLinkItunesConnectAnalyticsParameters : NSObject
 
 /**
@@ -255,7 +245,7 @@ FIR_SWIFT_NAME(DynamicLinkItunesConnectAnalyticsParameters)
  * @class FIRDynamicLinkAndroidParameters
  * @abstract The Dynamic Link Android parameters.
  */
-FIR_SWIFT_NAME(DynamicLinkAndroidParameters)
+NS_SWIFT_NAME(DynamicLinkAndroidParameters)
 @interface FIRDynamicLinkAndroidParameters : NSObject
 
 /**
@@ -303,7 +293,7 @@ FIR_SWIFT_NAME(DynamicLinkAndroidParameters)
  * @class FIRDynamicLinkSocialMetaTagParameters
  * @abstract The Dynamic Link Social Meta Tag parameters.
  */
-FIR_SWIFT_NAME(DynamicLinkSocialMetaTagParameters)
+NS_SWIFT_NAME(DynamicLinkSocialMetaTagParameters)
 @interface FIRDynamicLinkSocialMetaTagParameters : NSObject
 
 /**
@@ -344,7 +334,7 @@ FIR_SWIFT_NAME(DynamicLinkSocialMetaTagParameters)
  * @class FIRDynamicLinkNavigationInfoParameters
  * @abstract Options class for defining navigation behavior of the Dynamic Link.
  */
-FIR_SWIFT_NAME(DynamicLinkNavigationInfoParameters)
+NS_SWIFT_NAME(DynamicLinkNavigationInfoParameters)
 @interface FIRDynamicLinkNavigationInfoParameters : NSObject
 
 /**
@@ -379,7 +369,7 @@ FIR_SWIFT_NAME(DynamicLinkNavigationInfoParameters)
  * @abstract Options class for defining other platform(s) parameters of the Dynamic Link.
  *     Other here means not covered by specific parameters (not iOS and not Android).
  */
-FIR_SWIFT_NAME(DynamicLinkOtherPlatformParameters)
+NS_SWIFT_NAME(DynamicLinkOtherPlatformParameters)
 @interface FIRDynamicLinkOtherPlatformParameters : NSObject
 
 /**
@@ -411,7 +401,7 @@ FIR_SWIFT_NAME(DynamicLinkOtherPlatformParameters)
  * @class FIRDynamicLinkComponentsOptions
  * @abstract Options class for defining how Dynamic Link URLs are generated.
  */
-FIR_SWIFT_NAME(DynamicLinkComponentsOptions)
+NS_SWIFT_NAME(DynamicLinkComponentsOptions)
 @interface FIRDynamicLinkComponentsOptions : NSObject
 
 /**
@@ -444,7 +434,7 @@ FIR_SWIFT_NAME(DynamicLinkComponentsOptions)
  *     Dynamic Link URLs. Short URLs will have a domain and a randomized path; long URLs will have a
  *     domain and a query that contains all of the Dynamic Link parameters.
  */
-FIR_SWIFT_NAME(DynamicLinkComponents)
+NS_SWIFT_NAME(DynamicLinkComponents)
 @interface FIRDynamicLinkComponents : NSObject
 
 /**

FirebaseDynamicLinks/Sources/Public/FirebaseDynamicLinks/FIRDynamicLinks.h

@@ -16,9 +16,6 @@
 
 #import <Foundation/Foundation.h>
 
-#import <TargetConditionals.h>
-#if TARGET_OS_IOS
-
 #import "FIRDynamicLink.h"
 #import "FIRDynamicLinksCommon.h"
 
@@ -32,9 +29,11 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * @class FIRDynamicLinks
  * @abstract A class that checks for pending Dynamic Links and parses URLs.
+ *     This class is available on iOS only.
  */
 
 NS_EXTENSION_UNAVAILABLE_IOS("Firebase Dynamic Links is not supported for iOS extensions.")
+API_UNAVAILABLE(macos, tvos, watchos)
 NS_SWIFT_NAME(DynamicLinks)
 @interface FIRDynamicLinks : NSObject
 
@@ -141,5 +140,3 @@ NS_SWIFT_NAME(DynamicLinks)
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif