Merge branch 'master' of ssh://stash.corp.appnexus.com:7999/mobile-sd…

…k/app_mobile-sdk-ios

.gitignore

@@ -137,3 +137,5 @@ iOSInjectionProject/
 
 # xcshareddata
 Pods
+
+

AppNexusSDK.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "AppNexusSDK"
-  s.version      = "6.1.2"
+  s.version      = "7.0"
   s.platform     = :ios, "9.0"
 
   s.summary      = "AppNexus iOS Mobile Advertising SDK"
@@ -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.2'
+    subspec.dependency 'Smart-Display-SDK', '7.3.0'
     subspec.xcconfig              = { 'FRAMEWORK_SEARCH_PATHS' => '${PODS_ROOT}/Smart-Display-SDK/**' }
   end
 

RELEASE-NOTES.md

@@ -1,3 +1,27 @@
+## 7.0
+
+### New Feature
++ MS-3885 Added support for Multi Ad Request (MAR) (https://wiki.xandr.com/display/sdk/Single+Request+Mode+for+iOS
+
+### Mediation partner upgrade
++ Smart Server SDK v7.3.0
+
+### Improvements/Bug Fixes
++ MS-4122 - Fixed potential memory leak issue caused by improper deallocation of InstreamVideoAd object
++ MS-4094 - Code clean up to fix issue with OMID SDK video implementation
+
+
+## 6.2
+
+### New Features
++ MS-4097 California Consumer Privacy Act (CCPA) Support (https://wiki.xandr.com/display/sdk/SDK+Privacy+for+iOS)
+
+### Bug Fixes
++ MS-4124: Special characters not rendering over native assembly 
++ MS-4084: VideoAd Object not getting deallocated
++ MS-4095: Updated OMID partner name
+
+
 ## 6.1.2
 
 ### Improvements/Bug Fixes

sdk/AppNexusNativeSDK/AppNexusNativeSDK.h

@@ -38,5 +38,6 @@ FOUNDATION_EXPORT const unsigned char AppNexusNativeSDKVersionString[];
 #import <AppNexusNativeSDK/ANNativeCustomAdapter.h>
 #import <AppNexusNativeSDK/ANNativeMediatedAdResponse.h>
 #import <AppNexusNativeSDK/ANGDPRSettings.h>
+#import <AppNexusNativeSDK/ANUSPrivacySettings.h>
 
 

sdk/AppNexusNativeSDK/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.1.1</string>
+	<string>6.2</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>

sdk/AppNexusSDK/AppNexusSDK.h

@@ -20,23 +20,29 @@ FOUNDATION_EXPORT const unsigned char AppNexusSDKVersionString[];
 
 #import <AppNexusSDK/ANAdConstants.h>
 #import <AppNexusSDK/ANAdProtocol.h>
-#import <AppNexusSDK/ANAdView.h>
-#import <AppNexusSDK/ANBannerAdView.h>
-#import <AppNexusSDK/ANCustomAdapter.h>
-#import <AppNexusSDK/ANInterstitialAd.h>
-#import <AppNexusSDK/ANLocation.h>
+#import <AppNexusSDK/ANSDKSettings.h>
 #import <AppNexusSDK/ANLogManager.h>
 #import <AppNexusSDK/ANLogging.h>
+
+#import <AppNexusSDK/ANCustomAdapter.h>
+#import <AppNexusSDK/ANLocation.h>
 #import <AppNexusSDK/ANTargetingParameters.h>
-#import <AppNexusSDK/ANSDKSettings.h>
+#import <AppNexusSDK/ANProxyViewController.h>
+
+#import <AppNexusSDK/ANAdView.h>
+#import <AppNexusSDK/ANBannerAdView.h>
+#import <AppNexusSDK/ANInterstitialAd.h>
 #import <AppNexusSDK/ANVideoPlayerSettings.h>
 #import <AppNexusSDK/ANInstreamVideoAd.h>
-#import <AppNexusSDK/ANProxyViewController.h>
 
 #import <AppNexusSDK/ANNativeAdDelegate.h>
 #import <AppNexusSDK/ANNativeAdRequest.h>
 #import <AppNexusSDK/ANNativeAdResponse.h>
 #import <AppNexusSDK/ANNativeAdStarRating.h>
 #import <AppNexusSDK/ANNativeCustomAdapter.h>
 #import <AppNexusSDK/ANNativeMediatedAdResponse.h>
+
+#import <AppNexusSDK/ANMultiAdRequest.h>
+
 #import <AppNexusSDK/ANGDPRSettings.h>
+#import <AppNexusSDK/ANUSPrivacySettings.h>

sdk/AppNexusSDK/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>$(MARKETING_VERSION)</string>
+	<string>7.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

sdk/sourcefiles/ANAdProtocol.h

@@ -26,52 +26,29 @@
 
 
 #pragma mark - ANAdProtocol partitions.
-
 /**
  ANAdProtocol defines the properties and methods that are common to *all* ad types.
  It can be understood as a toolkit for implementing ad types.
  If you wanted to, you could implement your own ad type using this protocol.
  
  Currently, it is used in the implementation of banner and interstitial ads and instream video.
  */
-@protocol ANAdProtocolFoundation <NSObject>
 
-@required
-/**
- An AppNexus placement ID.  A placement ID is a numeric ID that's
- associated with a place where ads can be shown.  In our
- implementations of banner and interstitial ad views, we associate
- each ad view with a placement ID.
- */
-@property (nonatomic, readwrite, strong, nullable) NSString *placementId;
+@protocol ANAdProtocolFoundationCore <NSObject>
 
+@required
 /**
  An AppNexus member ID. A member ID is a numeric ID that's associated
  with the member that this app belongs to.
  */
 @property (nonatomic, readonly, assign) NSInteger memberId;
 
-/**
- An inventory code for a placement to represent a place where ads can
- be shown. In the presence of both placement and inventory code, AppNexus
- SDK favors inventory code over placement id. A member ID is required to request
- an ad using inventory code.
- */
-@property (nonatomic, readonly, strong, nullable) NSString *inventoryCode;
-
 /**
  The user's location.  See ANLocation.h in this directory for
  details.
  */
 @property (nonatomic, readwrite, strong, nullable) ANLocation *location;
 
-/**
- The reserve price is the minimum bid amount you'll accept to show
- an ad.  Use this with caution, as it can drastically reduce fill
- rates (i.e., you will make less money).
- */
-@property (nonatomic, readwrite, assign) CGFloat reserve;
-
 /**
  The user's age.  This can contain a numeric age, a birth year, or a
  hyphenated age range.  For example, "56", "1974", or "25-35".
@@ -88,12 +65,6 @@
  */
 @property (nonatomic, readwrite, strong, nullable) NSString *externalUid;
 
-/**
- Report the Ad Type of the returned ad object.
- Not available until load is complete and successful.
- */
-@property (nonatomic, readwrite)  ANAdType  adType;
-
 
 /**
  Set the user's current location.  This allows ad buyers to do location
@@ -135,6 +106,43 @@
  */
 - (void)clearCustomKeywords;
 
+@end   //ANAdProtocolFoundationCore
+
+
+
+#pragma mark -
+
+@protocol ANAdProtocolFoundation <ANAdProtocolFoundationCore>
+
+@required
+/**
+ An AppNexus placement ID.  A placement ID is a numeric ID that's
+ associated with a place where ads can be shown.  In our
+ implementations of banner and interstitial ad views, we associate
+ each ad view with a placement ID.
+ */
+@property (nonatomic, readwrite, strong, nullable) NSString *placementId;
+
+/**
+ An inventory code for a placement to represent a place where ads can
+ be shown. In the presence of both placement and inventory code, AppNexus
+ SDK favors inventory code over placement id. A member ID is required to request
+ an ad using inventory code.
+ */
+@property (nonatomic, readonly, strong, nullable) NSString *inventoryCode;
+
+/**
+ The reserve price is the minimum bid amount you'll accept to show
+ an ad.  Use this with caution, as it can drastically reduce fill
+ rates (i.e., you will make less money).
+ */
+@property (nonatomic, readwrite, assign) CGFloat reserve;
+
+/**
+ Report the Ad Type of the returned ad object.
+ Not available until load is complete and successful.
+ */
+@property (nonatomic, readwrite)  ANAdType  adType;
 
 /**
  Set the inventory code and member id for the place that ads will be shown.
@@ -145,6 +153,8 @@
 
 
 
+#pragma mark -
+
 @protocol ANAdProtocolBrowser
 
 /**
@@ -175,6 +185,8 @@
 
 
 
+#pragma mark -
+
 @protocol ANAdProtocolPublicServiceAnnouncement
 
 @required
@@ -203,7 +215,7 @@
 
 
 
-#pragma mark - ANAdProtocol entrypoint combinations.
+#pragma mark - ANAdProtocol adunit combinations.
 
 @protocol ANAdProtocol <ANAdProtocolFoundation, ANAdProtocolBrowser, ANAdProtocolPublicServiceAnnouncement>
 
@@ -265,7 +277,6 @@
 - (void)ad:(nonnull id)ad requestFailedWithError:(nonnull NSError *)error;
 
 
-
 /**
  Sent when the ad is clicked by the user.
  */

sdk/sourcefiles/ANInstreamVideoAd.h

@@ -39,10 +39,10 @@ typedef NS_ENUM(NSInteger, ANInstreamVideoPlaybackStateType)
 @protocol  ANInstreamVideoAdLoadDelegate <NSObject>
 
     @required
-    - (void)adDidReceiveAd:(nonnull id<ANAdProtocol>)ad;
+    - (void)adDidReceiveAd:(nonnull id)ad;
 
     @optional
-    - (void)ad:(nonnull id<ANAdProtocol>)ad requestFailedWithError:(nonnull NSError *)error;
+    - (void)ad:(nonnull id)ad requestFailedWithError:(nonnull NSError *)error;
 
 @end
 
@@ -86,7 +86,7 @@ typedef NS_ENUM(NSInteger, ANInstreamVideoPlaybackStateType)
 
     // Public properties.
     //
-    @property  (weak, nonatomic, readonly, nullable)  id<ANInstreamVideoAdLoadDelegate>  loadDelegate;
+    @property  (weak, nonatomic, readwrite, nullable)  id<ANInstreamVideoAdLoadDelegate>  loadDelegate;
     @property  (weak, nonatomic, readonly, nullable)  id<ANInstreamVideoAdPlayDelegate>  playDelegate;
 
     //