Updated version

BinaryProjects/AppNexusSDK/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.4</string>
+	<string>5.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

BinaryProjects/buildANSDK.sh

@@ -30,7 +30,7 @@ if [ $BITCODE == true ]; then
     echo "Bitcode enabled"
 fi
 
-schemes=( ANSDK ANSDKGoogleAdMobAdapter ANSDKFacebookAdapter ANSDKMillennialMediaAdapter ANSDKMoPubAdapter ANSDKAmazonAdapter ANSDKInMobiAdapter ANSDKVdopiaAdapter ANSDKVungleAdapter ANSDKAdColonyAdapter ANSDKChartboostAdapter ANSDKYahooAdapter ANAdapterForGoogleAdMobSDK ANAdapterForMoPubSDK ANSDKSmartAdAdapter ANSDKAdMarvelAdapter )
+schemes=( ANSDK ANSDKGoogleAdMobAdapter ANSDKFacebookAdapter ANSDKMillennialMediaAdapter ANSDKMoPubAdapter ANSDKAmazonAdapter ANSDKInMobiAdapter  ANAdapterForGoogleAdMobSDK ANAdapterForMoPubSDK ANSDKSmartAdAdapter )
 
 rm -fr "$OUTDIR" > /dev/null 2>&1
 rm -fr "$OD_DEVICE" > /dev/null 2>&1

RELEASE-NOTES.md

@@ -1,3 +1,21 @@
+## 5.5
+### New Features
++ MS-3778: Added new API to get Video Orientation for BannerVideo and Video Ads
+
+### Mediation partner upgrades/changes
++  Upgraded Facebook framework to v5.4.0
++  Removed support for following mediation Adaptor 
+    + AdColony SDK
+    + AdMarvel SDK
+    + Chartboost SDK
+    + Vdopia SDK 
+    + Vungle SDK 
+    + Yahoo SDK
+
+### Improvements/Bug Fixes
++ MS-3902: Removed deprecated APIs
++ MS-3311: Improved Objective-C API Declarations for Swift compatibility.
+
 ## 5.4
 ### New Features
 + MS-3730: Support Rendering for Banner Native ads

TestApps/UnitTestApp/UnitTestApp.xcodeproj/project.pbxproj

@@ -10,6 +10,8 @@
 		0E1D14B022784C0900343050 /* ANBannerNativeRenderingTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E1D14AF22784C0900343050 /* ANBannerNativeRenderingTestCase.m */; };
 		0E1D14B422784C9500343050 /* appnexus_bannerNative_rendering.json in Resources */ = {isa = PBXBuildFile; fileRef = 0E1D14B222784C9500343050 /* appnexus_bannerNative_rendering.json */; };
 		0E1D14B522784C9500343050 /* appnexus_bannerNative_renderingInvalidURL.json in Resources */ = {isa = PBXBuildFile; fileRef = 0E1D14B322784C9500343050 /* appnexus_bannerNative_renderingInvalidURL.json */; };
+		0E22083922D39CDD00654567 /* FBAudienceNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0ED15A662236C5D300D56022 /* FBAudienceNetwork.framework */; };
+		0E22083A22D39CDD00654567 /* FBAudienceNetwork.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0ED15A662236C5D300D56022 /* FBAudienceNetwork.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		0E2C248A2236AE4D006038E1 /* MediationBannerAdResizeTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E2C24892236AE4D006038E1 /* MediationBannerAdResizeTestCase.m */; };
 		0E2C24912236B075006038E1 /* GoogleMobileAds.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E2C24902236B075006038E1 /* GoogleMobileAds.framework */; };
 		0E4701602237A30B005CFFAC /* BannerAdResizeTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E47015E2237A30B005CFFAC /* BannerAdResizeTestCase.m */; };
@@ -513,6 +515,7 @@
 				0E4701C82237D450005CFFAC /* SCSCoreKit.framework in Embed Frameworks */,
 				0E4701C62237D44D005CFFAC /* SASDisplayKit.framework in Embed Frameworks */,
 				0EEAF645229BD0080008CAC9 /* AppNexusSDK.framework in Embed Frameworks */,
+				0E22083A22D39CDD00654567 /* FBAudienceNetwork.framework in Embed Frameworks */,
 				97A590C7228EAB3000D1C75C /* MoPubSDKFramework.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
@@ -827,6 +830,7 @@
 				0ED15A672236C5D300D56022 /* FBAudienceNetwork.framework in Frameworks */,
 				0ED15A5B2236C4B800D56022 /* InMobiSDK.framework in Frameworks */,
 				0ED15A4C2236C3B000D56022 /* libANAdapterForGoogleAdMobSDK.a in Frameworks */,
+				0E22083922D39CDD00654567 /* FBAudienceNetwork.framework in Frameworks */,
 				0ED15A4D2236C3B000D56022 /* libANAdapterForMoPubSDK.a in Frameworks */,
 				0ED15A502236C3B000D56022 /* libANSDKAmazonAdapter.a in Frameworks */,
 				0ED15A522236C3B000D56022 /* libANSDKFacebookAdapter.a in Frameworks */,

mediation/mediatedviews/Facebook/FacebookSDK/FBAudienceNetwork.framework/Headers/FBAdChoicesView.h

@@ -19,11 +19,12 @@
 #import <UIKit/UIKit.h>
 
 #import <FBAudienceNetwork/FBAdDefines.h>
+#import <FBAudienceNetwork/UIView+FBNativeAdViewTag.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
 @class FBAdImage;
-@class FBNativeAd;
+@class FBNativeAdBase;
 @class FBNativeAdViewAttributes;
 
 /**
@@ -50,42 +51,52 @@ FB_CLASS_EXPORT FB_SUBCLASSING_RESTRICTED
 /**
   The native ad that provides AdChoices info, such as the image url, and click url. Setting this updates the nativeAd.
  */
-@property (nonatomic, weak, readwrite, nullable) FBNativeAd *nativeAd;
+@property (nonatomic, weak, readwrite, nullable) FBNativeAdBase *nativeAd;
 
 /**
   Affects background mask rendering. Setting this property updates the rendering.
  */
 @property (nonatomic, assign, readwrite) UIRectCorner corner;
 
+/**
+ Affects background mask rendering. Setting this property updates the rendering.
+ */
+@property (nonatomic, assign, readwrite) UIEdgeInsets insets;
+
 /**
   The view controller to present the ad choices info from. If nil, the top view controller is used.
  */
 @property (nonatomic, weak, readwrite, null_resettable) UIViewController *rootViewController;
 
+/**
+ The tag for AdChoices view. It always returns FBNativeAdViewTagChoicesIcon.
+ */
+@property (nonatomic, assign, readonly) FBNativeAdViewTag nativeAdViewTag;
+
 /**
   Initialize this view with a given native ad. Configuration is pulled from the native ad.
 
- - Parameter nativeAd: The native ad to initialize with.
+ @param nativeAd The native ad to initialize with.
  */
-- (instancetype)initWithNativeAd:(FBNativeAd *)nativeAd;
+- (instancetype)initWithNativeAd:(FBNativeAdBase *)nativeAd;
 
 /**
   Initialize this view with a given native ad. Configuration is pulled from the native ad.
 
- - Parameter nativeAd: The native ad to initialize with.
- - Parameter expandable: Controls whether view defaults to expanded or not, see property documentation
+ @param nativeAd The native ad to initialize with.
+ @param expandable Controls whether view defaults to expanded or not, see property documentation
  */
-- (instancetype)initWithNativeAd:(FBNativeAd *)nativeAd
+- (instancetype)initWithNativeAd:(FBNativeAdBase *)nativeAd
                       expandable:(BOOL)expandable;
 
 /**
  Initialize this view with a given native ad. Configuration is pulled from the native ad.
 
- - Parameter nativeAd: The native ad to initialize with.
- - Parameter expandable: Controls whether view defaults to expanded or not, see property documentation
- - Parameter attributes: Attributes to configure look and feel.
+ @param nativeAd The native ad to initialize with.
+ @param expandable Controls whether view defaults to expanded or not, see property documentation
+ @param attributes Attributes to configure look and feel.
  */
-- (instancetype)initWithNativeAd:(FBNativeAd *)nativeAd
+- (instancetype)initWithNativeAd:(FBNativeAdBase *)nativeAd
                       expandable:(BOOL)expandable
                       attributes:(nullable FBNativeAdViewAttributes *)attributes;
 
@@ -97,10 +108,16 @@ FB_CLASS_EXPORT FB_SUBCLASSING_RESTRICTED
 /**
   Using the superview, this updates the frame of this view, positioning the icon in the corner specified. UIRectCornerAllCorners not supported.
 
- - Parameter corner: The corner to display this view from.
- - Parameter insets: Insets to take into account when positioning the view. Only respective insets are applied to corners.
+ @param corner The corner to display this view from.
  */
 - (void)updateFrameFromSuperview:(UIRectCorner)corner;
+
+/**
+  Using the superview, this updates the frame of this view, positioning the icon in the corner specified. UIRectCornerAllCorners not supported.
+
+ @param corner The corner to display this view from.
+ @param insets Insets to take into account when positioning the view. Only respective insets are applied to corners.
+ */
 - (void)updateFrameFromSuperview:(UIRectCorner)corner insets:(UIEdgeInsets)insets;
 
 @end

mediation/mediatedviews/Facebook/FacebookSDK/FBAudienceNetwork.framework/Headers/FBAdDefines.h

@@ -35,6 +35,7 @@
 
 #define FB_CLASS_EXPORT __attribute__((visibility("default")))
 #define FB_DEPRECATED __attribute__((deprecated))
+#define FB_DEPRECATED_WITH_MESSAGE(M) __attribute__((deprecated(M)))
 
 #if __has_feature(objc_generics)
 #define FB_NSArrayOf(x) NSArray<x>
@@ -60,18 +61,6 @@
 #define __nullable
 #endif
 
-#ifndef FB_IOS9_SDK_OR_LATER
-#define FB_IOS9_SDK_OR_LATER (__IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_9_0)
-#endif
-
-#ifndef FBInterfaceOrientationMask
-#if !FB_IOS9_SDK_OR_LATER
-#define FBInterfaceOrientationMask NSUInteger
-#else
-#define FBInterfaceOrientationMask UIInterfaceOrientationMask
-#endif // FB_IOS9_SDK_OR_LATER
-#endif // FBInterfaceOrientationMask
-
 #ifndef FB_SUBCLASSING_RESTRICTED
 #if defined(__has_attribute) && __has_attribute(objc_subclassing_restricted)
 #define FB_SUBCLASSING_RESTRICTED __attribute__((objc_subclassing_restricted))

mediation/mediatedviews/Facebook/FacebookSDK/FBAudienceNetwork.framework/Headers/FBAdSettings.h

@@ -90,7 +90,9 @@ typedef NS_ENUM(NSInteger, FBAdTestAdType) {
     /// carousel ad with square image and app install CTA option
     FBAdTestAdType_Carousel_Img_Square_App_Install,
     /// carousel ad with square image and link CTA option
-    FBAdTestAdType_Carousel_Img_Square_Link
+    FBAdTestAdType_Carousel_Img_Square_Link,
+    /// carousel ad with square video and link CTA option
+    FBAdTestAdType_Carousel_Vid_Square_Link
 };
 
 @protocol FBAdLoggingDelegate;
@@ -125,6 +127,11 @@ FB_CLASS_EXPORT FB_SUBCLASSING_RESTRICTED
  */
 @property (class, nonatomic, copy, readonly) NSString *bidderToken;
 
+/**
+ Generates routing token needed for requests routing in reverse-proxy, since we don't have cookies in app environments.
+ */
+@property (class, nonatomic, copy, readonly) NSString *routingToken;
+
 /**
  Returns test mode on/off.
  */
@@ -138,7 +145,7 @@ FB_CLASS_EXPORT FB_SUBCLASSING_RESTRICTED
 /**
   Adds a test device.
 
- - Parameter deviceHash: The id of the device to use test mode, can be obtained from debug log or testDeviceHash
+ @param deviceHash The id of the device to use test mode, can be obtained from debug log or testDeviceHash
 
 
 
@@ -150,7 +157,7 @@ FB_CLASS_EXPORT FB_SUBCLASSING_RESTRICTED
 /**
   Add a collection of test devices. See `+addTestDevices:` for details.
 
- - Parameter devicesHash: The array of the device id to use test mode, can be obtained from debug log or testDeviceHash
+ @param devicesHash The array of the device id to use test mode, can be obtained from debug log or testDeviceHash
  */
 + (void)addTestDevices:(FB_NSArrayOf(NSString *)*)devicesHash;
 
@@ -162,14 +169,14 @@ FB_CLASS_EXPORT FB_SUBCLASSING_RESTRICTED
 /**
   Clears the added test device
 
- - Parameter deviceHash: The id of the device using test mode, can be obtained from debug log or testDeviceHash
+ @param deviceHash The id of the device using test mode, can be obtained from debug log or testDeviceHash
  */
 + (void)clearTestDevice:(NSString *)deviceHash;
 
 /**
   Configures the ad control for treatment as child-directed.
 
- - Parameter isChildDirected: Indicates whether you would like your ad control to be treated as child-directed
+ @param isChildDirected Indicates whether you would like your ad control to be treated as child-directed
 
  Note that you may have other legal obligations under the Children's Online Privacy Protection Act (COPPA).
  Please review the FTC's guidance and consult with your own legal counsel.
@@ -179,7 +186,7 @@ FB_CLASS_EXPORT FB_SUBCLASSING_RESTRICTED
 /**
   If an ad provided service is mediating Audience Network in their sdk, it is required to set the name of the mediation service
 
- - Parameter service: Representing the name of the mediation that is mediation Audience Network
+ @param service Representing the name of the mediation that is mediation Audience Network
  */
 + (void)setMediationService:(NSString *)service;
 

mediation/mediatedviews/Facebook/FacebookSDK/FBAudienceNetwork.framework/Headers/FBAdView.h

@@ -20,6 +20,7 @@
 #import <UIKit/UIKit.h>
 
 #import <FBAudienceNetwork/FBAdDefines.h>
+#import <FBAudienceNetwork/FBAdExtraHint.h>
 #import <FBAudienceNetwork/FBAdSize.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -35,14 +36,27 @@ FB_CLASS_EXPORT
 /**
   This is a method to initialize an FBAdView matching the given placement id.
 
- - Parameter placementID: The id of the ad placement. You can create your placement id from Facebook developers page.
- - Parameter adSize: The size of the ad; for example, kFBAdSizeHeight50Banner or kFBAdSizeHeight90Banner.
- - Parameter viewController: The view controller that will be used to present the ad and the app store view.
+ @param placementID The id of the ad placement. You can create your placement id from Facebook developers page.
+ @param adSize The size of the ad; for example, kFBAdSizeHeight50Banner or kFBAdSizeHeight90Banner.
+ @param rootViewController The view controller that will be used to present the ad and the app store view.
  */
 - (instancetype)initWithPlacementID:(NSString *)placementID
                              adSize:(FBAdSize)adSize
                  rootViewController:(nullable UIViewController *)rootViewController NS_DESIGNATED_INITIALIZER;
 
+/**
+ This is a method to initialize an FBAdView matching the given placement id with a given bidding payload.
+
+ @param placementID The id of the ad placement. You can create your placement id from Facebook developers page.
+ @param bidPayload The bid payload sent from the server.
+ @param rootViewController The view controller that will be used to present the ad and the app store view.
+ @param error An out value that returns any error encountered during init.
+ */
+- (nullable instancetype)initWithPlacementID:(NSString *)placementID
+                                  bidPayload:(NSString *)bidPayload
+                          rootViewController:(nullable UIViewController *)rootViewController
+                                       error:(NSError * __autoreleasing *) error;
+
 /**
   Begins loading the FBAdView content.
 
@@ -59,23 +73,14 @@ FB_CLASS_EXPORT
  You can implement `adViewDidLoad:` and `adView:didFailWithError:` methods
  of `FBAdViewDelegate` if you would like to be notified as loading succeeds or fails.
 
- - Parameter bidPayload: The payload of the ad bid. You can get your bid id from Facebook bidder endpoint.
+ @param bidPayload The payload of the ad bid. You can get your bid id from Facebook bidder endpoint.
  */
 - (void)loadAdWithBidPayload:(NSString *)bidPayload;
 
 /**
-  This is a method to disable auto refresh for the FBAdView instance
-
-
- By default, we read the refresh interval from the placement setting in your Facebook
- developers page. Once you call this method, the auto refresh will be disabled for this FBAdView
- instance, and you cannot re-enable the refresh for this instance. A new created FBAdView will still
- use the default behavior.
-
- This method is designed for ad network mediation. We still recommend you to set the placement
- refresh interval as 'None' if you're using one of the ad network mediation.
+  There is no reason to call this method anymore. Autorefresh is disabled by default.
  */
-- (void)disableAutoRefresh;
+- (void)disableAutoRefresh FB_DEPRECATED;
 
 /**
   Typed access to the id of the ad placement.
@@ -85,10 +90,18 @@ FB_CLASS_EXPORT
   Typed access to the app's root view controller.
  */
 @property (nonatomic, weak, readonly, nullable) UIViewController *rootViewController;
+/**
+ Call isAdValid to check whether ad is valid
+ */
+@property (nonatomic, getter=isAdValid, readonly) BOOL adValid;
 /**
   the delegate
  */
 @property (nonatomic, weak, nullable) id<FBAdViewDelegate> delegate;
+/**
+  FBAdExtraHint to provide extra info
+ */
+@property (nonatomic, strong, nullable) FBAdExtraHint *extraHint;
 
 @end
 
@@ -104,43 +117,43 @@ FB_CLASS_EXPORT
 /**
   Sent after an ad has been clicked by the person.
 
- - Parameter adView: An FBAdView object sending the message.
+ @param adView An FBAdView object sending the message.
  */
 - (void)adViewDidClick:(FBAdView *)adView;
 /**
   When an ad is clicked, the modal view will be presented. And when the user finishes the
  interaction with the modal view and dismiss it, this message will be sent, returning control
  to the application.
 
- - Parameter adView: An FBAdView object sending the message.
+ @param adView An FBAdView object sending the message.
  */
 - (void)adViewDidFinishHandlingClick:(FBAdView *)adView;
 /**
   Sent when an ad has been successfully loaded.
 
- - Parameter adView: An FBAdView object sending the message.
+ @param adView An FBAdView object sending the message.
  */
 - (void)adViewDidLoad:(FBAdView *)adView;
 /**
   Sent after an FBAdView fails to load the ad.
 
- - Parameter adView: An FBAdView object sending the message.
- - Parameter error: An error object containing details of the error.
+ @param adView An FBAdView object sending the message.
+ @param error An error object containing details of the error.
  */
 - (void)adView:(FBAdView *)adView didFailWithError:(NSError *)error;
 
 /**
   Sent immediately before the impression of an FBAdView object will be logged.
 
- - Parameter adView: An FBAdView object sending the message.
+ @param adView An FBAdView object sending the message.
  */
 - (void)adViewWillLogImpression:(FBAdView *)adView;
 
 /**
   Asks the delegate for a view controller to present modal content, such as the in-app
  browser that can appear when an ad is clicked.
 
- - Returns: A view controller that is used to present modal content.
+ @return A view controller that is used to present modal content.
  */
 @property (nonatomic, readonly, strong) UIViewController *viewControllerForPresentingModalView;