SDK v7.21.0

* commit '63de00f7cd55de253131d48a7fe27a2ee7a1fb92':
  Updated release notes
  Added deprecated API
  SDK v7.21.0
  Merge pull request #802 in MOBILE-SDK/app_mobile-sdk-ios from MS-4953-UserID-Changes-iOS to develop
  Added-OMID_LICENSE
  MS-4980-OSS-remediation
  Tracker and Impression testcase were failing
  Sync MVP
  MS-4957 MS-4959 Updated Browserstack tests
  Script to build XCFramework and zip
  MS-4940 Jenkins Job Fixes

AppNexusSDK.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "AppNexusSDK"
-  s.version      = "7.20.0"
+  s.version      = "7.21.0"
   s.platform     = :ios, "9.0"
 
   s.summary      = "AppNexus iOS Mobile Advertising SDK"

RELEASE-NOTES.md

@@ -1,4 +1,27 @@
- ## 7.20.0
+We Intent to remove all the deprecated API's listed below in Xandr SDK v8.0. If you are using any of the below API's  we request to migrate to their [support](https://help.xandr.com/s/login/)ed equivalent. If you have any questions reach out to Xandr support.
+
+| Class                   | Property(s) and Method(s)     |
+| ------------------------|----------- |
+| ANBannerAdView   | **Property** : externalUid, adType, nativeAdRendererId, creativeId <br>   **Method** : - (void)setAllowNativeDemand:(BOOL)nativeDemand withRendererId:(NSInteger)rendererId;
+| ANInterstitialAd   | **Property** :   externalUid, adType, creativeId
+| ANInstreamVideoAd   | **Property** :   externalUid, adType, creativeId
+| ANMultiAdRequest   | **Property** :   externalUid, adType, creativeId
+| ANExternalUserId   | **Property** :   source, userId  <br>    **Method** : - (nullable instancetype)initWithSource:(ANExternalUserIdSource)source userId:(nonnull NSString *)userId;
+| ANNativeAdRequest   | **Property** :   rendererId, adType, externalUid
+| ANNativeAdResponse   | **Property** :   creativeId
+| ANSDKSettings   | **Property** :     HTTPSEnabled, externalUserIdArray, useAdnxsSimpleDomain
+|  ANTargetingParameters   | **Property** :    externalUid
+
+
+## 7.21.0
+### Improvement/Bug Fixes
++MS-4954 Added support for passing Publisher/Extended User Id(s) via ANSDKSettings.userIdArray. [https://docs.xandr.com/bundle/mobile-sdk/page/user-id-s--mapping-on-ios.html]
+
+### Deprecated APIs
+`ANSDKSettings.externalUserIdArray` property and `ANExternalUserId` class are now deprecated, use the equivalent  `ANSDKSettings.userIdArray` property  and `ANUserId` class instead.
+
+
+## 7.20.0
 ### Improvement/Bug Fixes
 + MS-4952 Check navigationType when opening a URL [Github PR #73]
 + MS-4851 Improved OMSDK performance 

script/buildxcframework.sh

@@ -1,34 +1,44 @@
+#!/bin/bash
+# buildxcframework.sh
+#	The AppNexusSDK.xcframework and AppNexusNativeSDK.xcframework are built using the script file.
+# 	These instructions will create a zip file named AppNexusSDK.xcframework.zip that contains three frameworks: AppNexusSDK.xcframework, OMSDK_Appnexus.xcframework, and AppNexusNativeSDK.xcframework.
+# 	The AppNexusSDK.xcframework with OMSDK_Appnexus.xcframework or AppNexusNativeSDK.xcframework framework with OMSDK_Appnexus can be used in any combination.
+# 	iphoneos archive, or iphonesimulator archive will be used to generate the xcframework.
+# 	All temporary binaries will be removed using rm commands once the xcframework has been produced and the zip has been created.
+
+
 # Output directory name
-OUTDIR=$1+"Framework"
-# Scheme name AppNexusSDK OR AppNexusNativeSDK
-SCHEMENAME=$1
-# for iPhones
+#Start Building AppNexusSDK.xcframework
+
+# Schema name AppNexusSDK OR AppNexusNativeSDK
+SCHEMANAME="AppNexusSDK"
+# Schema name for iPhones
 OD_DEVICE="iphoneos"
-# for simulator
+# Schema name for simulator
 OD_SIMULATOR="iphonesimulator"
 
 
 # Build archive for iphonesimulator
 xcodebuild archive \
- -scheme "$SCHEMENAME" \
- -archivePath ./"$OD_SIMULATOR"/"$SCHEMENAME"-"$OD_SIMULATOR".xcarchive \
+ -scheme "$SCHEMANAME" \
+ -archivePath ./"$OD_SIMULATOR"/"$SCHEMANAME"-"$OD_SIMULATOR".xcarchive \
  -sdk "$OD_SIMULATOR" \
  BUILD_LIBRARY_FOR_DISTRIBUTION=YES \
  SKIP_INSTALL=NO
 
 # Build archive for iphoneos
 xcodebuild archive \
- -scheme "$SCHEMENAME" \
- -archivePath ./"$OD_DEVICE"/"$SCHEMENAME"-"$OD_DEVICE".xcarchive \
+ -scheme "$SCHEMANAME" \
+ -archivePath ./"$OD_DEVICE"/"$SCHEMANAME"-"$OD_DEVICE".xcarchive \
  -sdk "$OD_DEVICE" \
  BUILD_LIBRARY_FOR_DISTRIBUTION=YES \
  SKIP_INSTALL=NO
 
  # Build XCFramework for using iphonesimulator and iphoneos archive
  xcodebuild -create-xcframework \
-    -framework ./"$OD_SIMULATOR"/"$SCHEMENAME"-"$OD_SIMULATOR".xcarchive/Products/Library/Frameworks/"$SCHEMENAME".framework \
-     -framework ./"$OD_DEVICE"/"$SCHEMENAME"-"$OD_DEVICE".xcarchive/Products/Library/Frameworks/"$SCHEMENAME".framework \
-   -output ./../XCFramework/"$SCHEMENAME".xcframework
+    -framework ./"$OD_SIMULATOR"/"$SCHEMANAME"-"$OD_SIMULATOR".xcarchive/Products/Library/Frameworks/"$SCHEMANAME".framework \
+     -framework ./"$OD_DEVICE"/"$SCHEMANAME"-"$OD_DEVICE".xcarchive/Products/Library/Frameworks/"$SCHEMANAME".framework \
+   -output ./../XCFramework/"$SCHEMANAME".xcframework
 
 # Zip XCFramework
 #zip -r "$OUTDIR" ../XCFramework
@@ -37,3 +47,54 @@ xcodebuild archive \
 rm -rf ./iphonesimulator
 rm -rf ./iphoneos
 #rm -rf ./../XCFramework
+
+
+SCHEMENAME_NATIVESDK="AppNexusNativeSDK"
+
+
+
+# Build archive for iphonesimulator
+xcodebuild archive \
+ -scheme "$SCHEMANAME_NATIVESDK" \
+ -archivePath ./"$OD_SIMULATOR"/"$SCHEMANAME_NATIVESDK"-"$OD_SIMULATOR".xcarchive \
+ -sdk "$OD_SIMULATOR" \
+ BUILD_LIBRARY_FOR_DISTRIBUTION=YES \
+ SKIP_INSTALL=NO
+
+
+
+ # Build archive for iphoneos
+xcodebuild archive \
+ -scheme "$SCHEMANAME_NATIVESDK" \
+ -archivePath ./"$OD_DEVICE"/"$SCHEMANAME_NATIVESDK"-"$OD_DEVICE".xcarchive \
+ -sdk "$OD_DEVICE" \
+ BUILD_LIBRARY_FOR_DISTRIBUTION=YES \
+ SKIP_INSTALL=NO
+
+ # Build XCFramework for using iphonesimulator and iphoneos archive
+ xcodebuild -create-xcframework \
+    -framework ./"$OD_SIMULATOR"/"$SCHEMANAME_NATIVESDK"-"$OD_SIMULATOR".xcarchive/Products/Library/Frameworks/"$SCHEMANAME_NATIVESDK".framework \
+     -framework ./"$OD_DEVICE"/"$SCHEMANAME_NATIVESDK"-"$OD_DEVICE".xcarchive/Products/Library/Frameworks/"$SCHEMANAME_NATIVESDK".framework \
+   -output ./../XCFramework/"$SCHEMANAME_NATIVESDK".xcframework
+
+# Removed archive and output folder
+rm -rf ./iphonesimulator
+rm -rf ./iphoneos
+
+
+# Copy OMSDK_Appnexus.xcframework from Viewability to XCFramework
+cp -a "./sourcefiles/Viewability/OMSDK_Appnexus.xcframework" "../XCFramework" 
+
+
+# Move to XCFramework folder
+cd ..
+cd XCFramework
+
+# create zip with name AppNexusSDK.xcframework.zip which included   AppNexusSDK.xcframework OMSDK_Appnexus.xcframework and AppNexusNativeSDK.xcframework
+zip -r ../AppNexusSDK.xcframework.zip *
+cd ..
+
+# Removed XCFramework  folder
+
+rm -rf XCFramework
+

script/runXcodeTests.sh

@@ -149,6 +149,7 @@ DYNAMIC_LIST_OF_VERSIONS_AND_DEVICES=
 STATIC_LIST_OF_SCHEMES="
     NativeSDKTestApp
     UnitTestApp
+    ExceptionalFunctionalApp
 "
 
 #

script/runbrowserStackTestIntegration.sh

@@ -8,6 +8,15 @@
 #brew update
 # Update homebrew recipes
 
+
+
+# Ask the user for BrowserStack details before starting to run the tests.
+read -p 'Username: ' userName
+read -sp 'AccessKey: ' accessKey
+
+echo "\nThankyou BrowserStack tests will be run as user $userName"
+
+
 pod install
 sh ../../script/buildxcframework.sh AppNexusSDK
 
@@ -30,9 +39,7 @@ xcodebuild -exportArchive -archivePath ./automationbuild/output/Integration.xcar
 presentWorkingDirectory=$(pwd)
 echo "presentWorkingDirectory==> $presentWorkingDirectory"
 
-# Set Browser Stack userName & accessKey
-userName="mobilesdkteam1"
-accessKey="eAqGKNyysiKQmX1wDUQ4"
+
 
 # Add devices list
 #devices="\"iPhone 11 Pro-13\",\"iPhone XS-14\",\"iPhone 12-14\",\"iPhone 11-14\",\"iPhone XS-13\""
@@ -72,8 +79,6 @@ echo "<==Running TrackerTest==>"
 
 
 
-#curl -X POST "https://api-cloud.browserstack.com/app-automate/xcuitest/build" -d "{\"networkLogs\" : \"true\",\"devices\": [\"iPhone 12-14\"], \"app\": \"bs://74599fafa50b371b4a4dd401a2afc43b655e0674\", \"deviceLogs\" : \"true\", \"testSuite\": \"bs://ab1a36124263e60855b9eaacd82c37c988cef4d0\"}" -H "Content-Type: application/json" -u "mobilesdkteam1:eAqGKNyysiKQmX1wDUQ4"
-
 buildIdTrackerTest=$(curl -X POST "https://api-cloud.browserstack.com/app-automate/xcuitest/build" -d "{\"networkLogs\" : \"true\"
 ,\"devices\": [$devices], \"app\": $appurl, \"deviceLogs\" : \"true\", \"testSuite\": $tracker_test_url}" -H "Content-Type: application/json" -u "$userName:$accessKey"| jq .build_id  | tr -d \")
 echo "buildIdTrackerTest==> $buildIdTrackerTest"
@@ -97,18 +102,16 @@ echo "buildIdTrackerTest ab ==> $buildIdTrackerTest"
 # Wait for testcase result Tracker Tests
 testTrackerTestResult="running"
 if [ $testTrackerTestResult == "running" ] ; then result=true; else result=false; fi
-while $result; do sleep 1; testTrackerTestResult=$(curl -u "mobilesdkteam1:eAqGKNyysiKQmX1wDUQ4" -X GET "https://api-cloud.browserstack.com/app-automate/xcuitest/v2/builds/$buildIdTrackerTest" | jq '.status' | tr -d \");
+while $result; do sleep 1; testTrackerTestResult=$(curl -u "$userName:$accessKey" -X GET "https://api-cloud.browserstack.com/app-automate/xcuitest/v2/builds/$buildIdTrackerTest" | jq '.status' | tr -d \");
 
 if [ $testTrackerTestResult == "running" ] ; then result=true; else result=false; fi
 echo "Please wait.......\n";
 sleep 60
 done
-#testTrackerTestResult=$(curl -u "mobilesdkteam1:eAqGKNyysiKQmX1wDUQ4" -X GET "https://api-cloud.browserstack.com/app-automate/xcuitest/v2/builds/$buildIdTrackerTest" | json status
 echo "Test Result Impression & Click Tracker.......$testTrackerTestResult\n";
 
 
 
 if [ $testTrackerTestResult != "passed" ] ; then
     exit 1
 fi
-

script/runbrowserStackTestTrackerApp.sh

@@ -8,6 +8,14 @@ echo "M0bil35DK" | sudo -S chown -R `whoami` ~/.npm
 #brew update
 # Update homebrew recipes
 
+# Ask the user for BrowserStack details before starting to run the tests.
+read -p 'Username: ' userName
+read -sp 'AccessKey: ' accessKey
+
+echo "\nThankyou BrowserStack tests will be run as user $userName"
+
+
+
 brew install jq
 
 #curl -s http://api.open-notify.org/iss-now.json | jq .timestamp
@@ -26,10 +34,6 @@ xcodebuild -exportArchive -archivePath ./automationbuild/output/TrackerApp.xcarc
 presentWorkingDirectory=$(pwd)
 echo "presentWorkingDirectory==> $presentWorkingDirectory"
 
-# Set Browser Stack userName & accessKey
-userName="mobilesdkteam1"
-accessKey="eAqGKNyysiKQmX1wDUQ4"
-
 # Add devices list
 #devices="\"iPhone 11 Pro-13\",\"iPhone XS-14\",\"iPhone 12-14\",\"iPhone 11-14\",\"iPhone XS-13\""
 devices="\"iPhone 12-14\""
@@ -38,8 +42,6 @@ devices="\"iPhone 12-14\""
 ##devices=["iPhone 11 Pro-13","iPhone XS-14","iPhone 12-14","iPhone 11-14","iPhone XS-13"]
 echo " devcies==>$devices"
 
-#curl -u "mobilesdkteam1:eAqGKNyysiKQmX1wDUQ4" -X POST "https://api-cloud.browserstack.com/app-automate/upload" -F "file=@/Users/abhisheksharma/Documents/AAAAMobileSDK/mobile-sdk-ios/tests/TrackerUITest/automationbuild/output/ipa/TrackerApp.ipa"
-
 # Upload IPA for browser Stack and get appurl
 appurl=$(curl -u "$userName:$accessKey" -X POST "https://api-cloud.browserstack.com/app-automate/upload" -F "file=@$presentWorkingDirectory/automationbuild/output/ipa/TrackerApp.ipa" | jq .app_url)
 echo "appurl==> $appurl"
@@ -92,18 +94,16 @@ echo "buildIdTrackerTest ab ==> $buildIdTrackerTest"
 # Wait for testcase result Tracker Tests
 testTrackerTestResult="running"
 if [ $testTrackerTestResult == "running" ] ; then result=true; else result=false; fi
-while $result; do sleep 1; testTrackerTestResult=$(curl -u "mobilesdkteam1:eAqGKNyysiKQmX1wDUQ4" -X GET "https://api-cloud.browserstack.com/app-automate/xcuitest/v2/builds/$buildIdTrackerTest" | jq '.status' | tr -d \");
+while $result; do sleep 1; testTrackerTestResult=$(curl -u "$userName:$accessKey" -X GET "https://api-cloud.browserstack.com/app-automate/xcuitest/v2/builds/$buildIdTrackerTest" | jq '.status' | tr -d \");
 
 if [ $testTrackerTestResult == "running" ] ; then result=true; else result=false; fi
 echo "Please wait.......\n";
 sleep 60
 done
-#testTrackerTestResult=$(curl -u "mobilesdkteam1:eAqGKNyysiKQmX1wDUQ4" -X GET "https://api-cloud.browserstack.com/app-automate/xcuitest/v2/builds/$buildIdTrackerTest" | json status
 echo "Test Result Impression & Click Tracker.......$testTrackerTestResult\n";
 
 
 
 if [ $testTrackerTestResult != "passed" ] ; then
     exit 1
 fi
-

sdk/AppNexusNativeSDK/AppNexusNativeSDK.h

@@ -51,3 +51,4 @@ FOUNDATION_EXPORT const unsigned char AppNexusNativeSDKVersionString[];
 #import <AppNexusNativeSDK/ANCSRNativeAdResponse.h>
 
 #import <AppNexusNativeSDK/ANExternalUserId.h>
+#import <AppNexusNativeSDK/ANUserId.h>

sdk/AppNexusNativeSDK/SDK-Info.plist

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

sdk/AppNexusSDK.xcodeproj/project.pbxproj

@@ -13,6 +13,10 @@
 		006F6B9E2295F72A003D2DF0 /* ANAdFetcherBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 006F6B9D2295F72A003D2DF0 /* ANAdFetcherBase.h */; };
 		006F6BA02295FFCD003D2DF0 /* ANWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 60183FD222933E9500CFDE33 /* ANWebView.h */; };
 		006F6BA12295FFD0003D2DF0 /* ANWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = 60183FD322933E9500CFDE33 /* ANWebView.m */; };
+		0086BC9A27DB006200BBDE61 /* ANUserId.h in Headers */ = {isa = PBXBuildFile; fileRef = 0086BC9927DB006200BBDE61 /* ANUserId.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		0086BC9B27DB006200BBDE61 /* ANUserId.h in Headers */ = {isa = PBXBuildFile; fileRef = 0086BC9927DB006200BBDE61 /* ANUserId.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		0086BCA027DB01A800BBDE61 /* ANUserId.m in Sources */ = {isa = PBXBuildFile; fileRef = 0086BC9F27DB01A800BBDE61 /* ANUserId.m */; };
+		0086BCA127DB01A800BBDE61 /* ANUserId.m in Sources */ = {isa = PBXBuildFile; fileRef = 0086BC9F27DB01A800BBDE61 /* ANUserId.m */; };
 		0099B483228CA0EB004E80AB /* UIView+ANCategory.h in Headers */ = {isa = PBXBuildFile; fileRef = ECE4EA9A194B768A0069D934 /* UIView+ANCategory.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		0099B484228CA0F6004E80AB /* UIView+ANCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = ECE4EA9B194B768A0069D934 /* UIView+ANCategory.m */; };
 		0099B485228CA18C004E80AB /* NSTimer+ANCategory.h in Headers */ = {isa = PBXBuildFile; fileRef = ECE4EA98194B768A0069D934 /* NSTimer+ANCategory.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -370,6 +374,8 @@
 		0035C5AF1F44971100915E97 /* ANSSMMediationAdViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ANSSMMediationAdViewController.m; sourceTree = "<group>"; };
 		006F6B992295F70E003D2DF0 /* ANAdFetcherBase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ANAdFetcherBase.m; sourceTree = "<group>"; };
 		006F6B9D2295F72A003D2DF0 /* ANAdFetcherBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ANAdFetcherBase.h; sourceTree = "<group>"; };
+		0086BC9927DB006200BBDE61 /* ANUserId.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ANUserId.h; sourceTree = "<group>"; };
+		0086BC9F27DB01A800BBDE61 /* ANUserId.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ANUserId.m; sourceTree = "<group>"; };
 		00C4919225DF043100609E49 /* ANExternalUserId.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ANExternalUserId.h; sourceTree = "<group>"; };
 		00C491C025DF15AB00609E49 /* ANExternalUserId.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ANExternalUserId.m; sourceTree = "<group>"; };
 		00D6B04720D1BC9B007A3439 /* ANOMIDImplementation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ANOMIDImplementation.h; sourceTree = "<group>"; };
@@ -879,6 +885,7 @@
 				60D39E1422570FE20029F741 /* ANVideoPlayerSettings.m */,
 				60183FD222933E9500CFDE33 /* ANWebView.h */,
 				60183FD322933E9500CFDE33 /* ANWebView.m */,
+				0086BC9F27DB01A800BBDE61 /* ANUserId.m */,
 			);
 			path = internal;
 			sourceTree = "<group>";
@@ -1034,6 +1041,7 @@
 				ECE4EA94194B768A0069D934 /* ANTargetingParameters.h */,
 				973B23A9238D1E4C00717D67 /* ANUSPrivacySettings.h */,
 				60D39E1322570FE20029F741 /* ANVideoPlayerSettings.h */,
+				0086BC9927DB006200BBDE61 /* ANUserId.h */,
 			);
 			path = "public-headers";
 			sourceTree = "<group>";
@@ -1045,6 +1053,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				0086BC9A27DB006200BBDE61 /* ANUserId.h in Headers */,
 				8A9AEDB11A1BE8C200C58BDA /* ANAdConstants.h in Headers */,
 				006F6B9E2295F72A003D2DF0 /* ANAdFetcherBase.h in Headers */,
 				607A21141F85557E00BD8353 /* ANAdFetcherResponse.h in Headers */,
@@ -1187,6 +1196,7 @@
 				F52F82F2229338FC00F4578C /* ANProxyViewController.h in Headers */,
 				F5731B7B228C94850012B134 /* ANReachability.h in Headers */,
 				60C4CB0325DD76B500A744CC /* ANRealTimer.h in Headers */,
+				0086BC9B27DB006200BBDE61 /* ANUserId.h in Headers */,
 				F5731B63228C8E150012B134 /* ANRTBVideoAd.h in Headers */,
 				F5731B6D228C8E470012B134 /* ANSDKSettings+PrivateMethods.h in Headers */,
 				F5731BC1228C9A240012B134 /* ANSDKSettings.h in Headers */,
@@ -1418,6 +1428,7 @@
 				8A2F48261A2E255600B0EA05 /* ANOpenInExternalBrowserActivity.m in Sources */,
 				602ADF6720178BAF00BEF101 /* ANProxyViewController.m in Sources */,
 				8A9AEE021A1BF99D00C58BDA /* ANReachability.m in Sources */,
+				0086BCA027DB01A800BBDE61 /* ANUserId.m in Sources */,
 				60C4CB0425DD76B500A744CC /* ANRealTimer.m in Sources */,
 				0E290E4422844DEC00468327 /* ANRTBNativeAdResponse.m in Sources */,
 				609732DC1E42E9860061EC0A /* ANRTBVideoAd.m in Sources */,
@@ -1488,6 +1499,7 @@
 				60C4CB0525DD76B500A744CC /* ANRealTimer.m in Sources */,
 				F5731B64228C8E190012B134 /* ANRTBVideoAd.m in Sources */,
 				F5731B6E228C8E4A0012B134 /* ANSDKSettings.m in Sources */,
+				0086BCA127DB01A800BBDE61 /* ANUserId.m in Sources */,
 				F5731B66228C8E200012B134 /* ANSSMStandardAd.m in Sources */,
 				F5731B68228C8E260012B134 /* ANSSMVideoAd.m in Sources */,
 				F5731B6A228C8E2D0012B134 /* ANStandardAd.m in Sources */,
@@ -1543,7 +1555,7 @@
 					"@loader_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "";
-				MARKETING_VERSION = 7.8;
+				MARKETING_VERSION = 7.21.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "corp.appnexus.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1585,7 +1597,7 @@
 					"@loader_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = "";
-				MARKETING_VERSION = 7.8;
+				MARKETING_VERSION = 7.21.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "corp.appnexus.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";

sdk/AppNexusSDK/AppNexusSDK.h

@@ -49,6 +49,7 @@ FOUNDATION_EXPORT const unsigned char AppNexusSDKVersionString[];
 #import <AppNexusSDK/ANGDPRSettings.h>
 #import <AppNexusSDK/ANUSPrivacySettings.h>
 #import <AppNexusSDK/ANExternalUserId.h>
+#import <AppNexusSDK/ANUserId.h>
 
 
 

sdk/AppNexusSDK/SDK-Info.plist

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

sdk/sourcefiles/Resources/sidecar.txt

@@ -0,0 +1,7 @@
+"Copyright (c) 2010-2020 Google LLC. http://angularjs.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ""Software""), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE."