SDK v6.1

* commit 'b56009eedae9e4e8b62a4b0e6a9234a851696d0f': (26 commits) podspec v6.1 v6.1 Added v6.1 Facebook v5.5.1 Blank Spaces in VAST XML Added getCurrentAppOrientation MRAID 3.0 Remove Volume Bar iOS 13 iOS 13 CardView to fullScreen OMID v1.2.19 Merge pull request #450 in MOBILE-SDK/app_mobile-sdk-ios from MS-4038_SmartAdServer_iOS to develop Merge pull request #451 in MOBILE-SDK/app_mobile-sdk-ios from MS-4035_GoogleAdMob_Update_iOS to develop Fixed ANReachabilityTestCase fix linker errors in project file moved from unit tests to functional tests formatting formatting testing formatting test removed commented code added unittests replaced UIWebView to WKWebView ...
appnexus · Oct 3, 2019 · bd8fc8a · bd8fc8a
2 parents a779754 + b56009e
commit bd8fc8a
Show file tree

Hide file tree

Showing 213 changed files with 1,830 additions and 3,760 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@
 **/Products
 **/out_device
 **/out_simulator
+**/xcshareddata
 ########################################################################################
 # macOS.gitignore
 # https://github.com/github/gitignore/blob/master/Global/macOS.gitignore

diff --git a/AppNexusSDK.podspec b/AppNexusSDK.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "AppNexusSDK"
-  s.version      = "6.0"
+  s.version      = "6.1"
   s.platform     = :ios, "9.0"
 
   s.summary      = "AppNexus iOS Mobile Advertising SDK"
@@ -23,13 +23,13 @@ DESC
     subspec.source_files         = "sdk/sourcefiles/**/*.{h,m}"
     subspec.public_header_files  = "sdk/sourcefiles/*.h","sdk/sourcefiles/native/*.h"
     subspec.resources            = "sdk/sourcefiles/**/*.{png,bundle,xib,nib,js,html,strings}"
-    subspec.vendored_libraries   = "sdk/sourcefiles/Viewability/**/*.a"
+    subspec.vendored_frameworks   = "sdk/sourcefiles/Viewability/OMSDK_Appnexus.framework"
     subspec.frameworks           = 'WebKit'
   end
 
   s.subspec 'GoogleAdapter' do |subspec|
     subspec.dependency  'AppNexusSDK/AppNexusSDK', "#{s.version}"
-    subspec.dependency  'Google-Mobile-Ads-SDK', '7.48.0'
+    subspec.dependency  'Google-Mobile-Ads-SDK', '7.50.0'
     subspec.source_files         = "mediation/mediatedviews/GoogleAdMob/*.{h,m}"
     subspec.public_header_files  = "mediation/mediatedviews/GoogleAdMob/ANAdAdapterNativeAdMob.h"
     subspec.xcconfig              = { 'FRAMEWORK_SEARCH_PATHS' => '${PODS_ROOT}/Google-Mobile-Ads-SDK/**' }
@@ -45,7 +45,7 @@ DESC
 
   s.subspec 'FacebookAdapter' do |subspec|
     subspec.dependency  'AppNexusSDK/AppNexusSDK', "#{s.version}"
-    subspec.dependency 'FBAudienceNetwork', '4.28.1'
+    subspec.dependency 'FBAudienceNetwork', '5.5.1'
     subspec.source_files         = "mediation/mediatedviews/Facebook/*.{h,m}"
     subspec.public_header_files  = "mediation/mediatedviews/Facebook/ANAdAdapterNativeFacebook.h"
     subspec.xcconfig              = { 'FRAMEWORK_SEARCH_PATHS' => '${PODS_ROOT}/FBAudienceNetwork/**' }
@@ -79,7 +79,7 @@ DESC
     subspec.dependency 'AppNexusSDK/AppNexusSDK', "#{s.version}"
     subspec.source_files = "mediation/mediatedviews/SmartAd/*.{h,m}"
     subspec.public_header_files = "mediation/mediatedviews/SmartAd/ANAdAdapterSmartAdBase.h"
-    subspec.dependency 'Smart-Display-SDK', '7.1.1'
+    subspec.dependency 'Smart-Display-SDK', '7.2'
     subspec.xcconfig              = { 'FRAMEWORK_SEARCH_PATHS' => '${PODS_ROOT}/Smart-Display-SDK/**' }
   end
 
@@ -92,7 +92,7 @@ DESC
 
   s.subspec 'AdMobCustomEventAdapter' do |subspec|
     subspec.dependency 'AppNexusSDK/AppNexusSDK', "#{s.version}"
-    subspec.dependency 'Google-Mobile-Ads-SDK', '7.48.0'
+    subspec.dependency 'Google-Mobile-Ads-SDK', '7.50.0'
     subspec.xcconfig              = { 'FRAMEWORK_SEARCH_PATHS' => '${PODS_ROOT}/Google-Mobile-Ads-SDK/**' }
     subspec.source_files          = "mediation/mediating/GoogleAdMob/*.{h,m}"
     subspec.private_header_files  = "mediation/mediating/GoogleAdMob/*.h"

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,3 +1,24 @@
+## 6.1
+
+### New Features
++ MS-3983: Added new API to Pause/Resume(https://wiki.xandr.com/display/sdk/Show+an+Instream+Video+Ads+on+iOS) VideoAd
++ MS-4057: Official release for iOS 13 support 
+
+### Mediation partner upgrades
++ Smart Server SDK v7.2
++ FacebookAd SDK v5.5.1(has breaking changes, please look at Mediation Docs(https://wiki.xandr.com/display/sdk/Mediate+with+iOS) for updated integration instruction)
++ Google AdMob SDK v7.50
+
+### Improvements/Bug Fixes
++ MS-3915,MS-3916: Improved Banner Ad performance 
++ MS-3948: Removed AppNexusSDKResources.Bundle
++ MS-3951: Fixed open measurement geometry change events for VideoAd
++ MS-3976: Fixed escape character breaking VideoAd load
++ MS-3987: Upgraded to OMSDK v1.2.19
++ MS-4004: Fixed VideoAd's pause issue when application state changes
++ MS-4023: Removed usage of UIWebView
++ MS-4036: Fixed interstitial crash on orientation change if orientation not supported by host application (Github #47)
+
 ## 6.0
 
 At Xandr we listen to our users' feedback to help us develop the products that provide the best solutions for their needs. Based on that feedback, we are proud to announce the release of v6.0, a major upgrade to our iOS Mobile SDK.

diff --git a/mediation/mediatedviews/Facebook/ANAdAdapterNativeFacebook.m b/mediation/mediatedviews/Facebook/ANAdAdapterNativeFacebook.m
@@ -18,6 +18,8 @@
 @interface ANAdAdapterNativeFacebook ()
 
 @property (nonatomic) FBNativeAd *fbNativeAd;
+@property (nonatomic) FBMediaView *fbMediaView;
+@property (nonatomic) FBMediaView *fbAdIcon;
 
 @end
 
@@ -37,16 +39,55 @@ - (void)requestNativeAdWithServerParameter:(nullable NSString *)parameterString
     [self.fbNativeAd loadAd];
 }
 
+-(BOOL) getMediaViewsForRegisterView:(nonnull UIView *)view{
+
+    for (UIView *subview in [view subviews]){
+        if([subview isKindOfClass:[FBMediaView class]]){
+            FBMediaView *fbAdView = (FBMediaView *)subview;
+            switch (fbAdView.nativeAdViewTag) {
+                case FBNativeAdViewTagIcon:
+                    self.fbAdIcon = fbAdView;
+                    break;
+                default:
+                    self.fbMediaView = fbAdView;
+                    break;
+            }
+        }else if([subview isKindOfClass:[UIView class]])
+        {
+            [self getMediaViewsForRegisterView:subview];
+        }
+        if(self.fbMediaView && self.fbAdIcon){
+            break;
+        }
+    }
+    if(self.fbMediaView) {
+        return YES;
+    }
+
+    return NO;
+}
+
 - (void)registerViewForImpressionTrackingAndClickHandling:(nonnull UIView *)view
                                    withRootViewController:(nonnull UIViewController *)rvc
                                            clickableViews:(nullable NSArray *)clickableViews {
-    if (clickableViews.count) {
-        [self.fbNativeAd registerViewForInteraction:view
-                                 withViewController:rvc
-                                 withClickableViews:clickableViews];
-    } else {
-        [self.fbNativeAd registerViewForInteraction:view
-                                 withViewController:rvc];
+
+    if([self getMediaViewsForRegisterView:view]){
+        if(clickableViews.count != 0) {
+            [self.fbNativeAd registerViewForInteraction:view
+                                              mediaView:self.fbMediaView
+                                               iconView:self.fbAdIcon
+                                         viewController:rvc
+                                         clickableViews:clickableViews];
+
+        }else {
+            [self.fbNativeAd registerViewForInteraction:view
+                                              mediaView:self.fbMediaView
+                                               iconView:self.fbAdIcon
+                                         viewController:rvc];
+        }
+    }
+    else{
+        ANLogDebug(@"View does not contain mediaView for registerViewForImpressionTracking.");
     }
 }
 
@@ -76,11 +117,9 @@ - (void)nativeAd:(FBNativeAd *)nativeAd didFailWithError:(NSError *)error {
 
 - (void)nativeAdDidLoad:(FBNativeAd *)nativeAd {
     ANNativeMediatedAdResponse *response = [[ANNativeMediatedAdResponse alloc] initWithCustomAdapter:self
-                                                                                         networkCode:ANNativeAdNetworkCodeFacebook];
-    response.title = nativeAd.title;
-    response.body = nativeAd.body;
-    response.iconImageURL = nativeAd.icon.url;
-    response.mainImageURL = nativeAd.coverImage.url;
+                                                                                        networkCode:ANNativeAdNetworkCodeFacebook];
+    response.title = nativeAd.headline;
+    response.body = nativeAd.bodyText;
     response.callToAction = nativeAd.callToAction;
     response.customElements = @{ kANNativeElementObject : nativeAd};
 

diff --git a/mediation/mediatedviews/GoogleAdMob/ANAdAdapterBannerAdMob.m b/mediation/mediatedviews/GoogleAdMob/ANAdAdapterBannerAdMob.m
@@ -134,9 +134,6 @@ - (void)adView:(GADBannerView *)view didFailToReceiveAdWithError:(GADRequestErro
         case kGADErrorMediationAdapterError:
             code = ANAdResponseInternalError;
             break;
-        case kGADErrorMediationNoFill:
-            code = ANAdResponseUnableToFill;
-            break;
         case kGADErrorMediationInvalidAdSize:
             code = ANAdResponseInvalidRequest;
             break;

diff --git a/mediation/mediatedviews/GoogleAdMob/ANAdAdapterBannerDFP.m b/mediation/mediatedviews/GoogleAdMob/ANAdAdapterBannerDFP.m
@@ -187,9 +187,6 @@ - (void)adView:(GADBannerView *)view didFailToReceiveAdWithError:(GADRequestErro
         case kGADErrorMediationAdapterError:
             code = ANAdResponseInternalError;
             break;
-        case kGADErrorMediationNoFill:
-            code = ANAdResponseUnableToFill;
-            break;
         case kGADErrorMediationInvalidAdSize:
             code = ANAdResponseInvalidRequest;
             break;

diff --git a/mediation/mediatedviews/GoogleAdMob/ANAdAdapterBaseDFP.m b/mediation/mediatedviews/GoogleAdMob/ANAdAdapterBaseDFP.m
@@ -98,9 +98,6 @@ + (ANAdResponseCode)responseCodeFromRequestError:(GADRequestError *)error {
         case kGADErrorMediationAdapterError:
             code = ANAdResponseInternalError;
             break;
-        case kGADErrorMediationNoFill:
-            code = ANAdResponseUnableToFill;
-            break;
         case kGADErrorMediationInvalidAdSize:
             code = ANAdResponseInvalidRequest;
             break;

diff --git a/mediation/mediatedviews/GoogleAdMob/ANAdAdapterInterstitialAdMob.m b/mediation/mediatedviews/GoogleAdMob/ANAdAdapterInterstitialAdMob.m
@@ -99,9 +99,6 @@ - (void)interstitial:(GADInterstitial *)ad didFailToReceiveAdWithError:(GADReque
         case kGADErrorMediationAdapterError:
             code = ANAdResponseInternalError;
             break;
-        case kGADErrorMediationNoFill:
-            code = ANAdResponseUnableToFill;
-            break;
         case kGADErrorMediationInvalidAdSize:
             code = ANAdResponseInvalidRequest;
             break;

diff --git a/mediation/mediatedviews/GoogleAdMob/ANAdAdapterInterstitialDFP.m b/mediation/mediatedviews/GoogleAdMob/ANAdAdapterInterstitialDFP.m
@@ -99,9 +99,6 @@ - (void)interstitial:(GADInterstitial *)ad didFailToReceiveAdWithError:(GADReque
         case kGADErrorMediationAdapterError:
             code = ANAdResponseInternalError;
             break;
-        case kGADErrorMediationNoFill:
-            code = ANAdResponseUnableToFill;
-            break;
         case kGADErrorMediationInvalidAdSize:
             code = ANAdResponseInvalidRequest;
             break;

diff --git a/sdk/AppNexusNativeSDK/Info.plist b/sdk/AppNexusNativeSDK/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.0</string>
+	<string>6.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>