Merge pull request #870 in MOBILE-SDK/app_mobile-sdk-ios from Release…

…_8.2.0 to master * commit 'bf702162a96dad320b2b9d865a9ff857f5d4e126': Release changes and version updates Merge pull request #868 in MOBILE-SDK/app_mobile-sdk-ios from Fixed_Unit_Tests to develop Merge pull request #866 in MOBILE-SDK/app_mobile-sdk-ios from MS-5183-iOS-SDK-initialization-8.1.1 to develop Merge pull request #864 in MOBILE-SDK/app_mobile-sdk-ios from MS-5137_gpp_ios to develop Merge pull request #865 in MOBILE-SDK/app_mobile-sdk-ios from ppid-2 to develop Updated Facebook SDK to 6.12 and tested with AppNexusSDKApp MS-5112 Update logic to pass PPID to impbus
appnexus · Dec 1, 2022 · bfcf76c · bfcf76c
2 parents 400f839 + bf70216
commit bfcf76c
Show file tree

Hide file tree

Showing 25 changed files with 1,165 additions and 581 deletions.
diff --git a/AppNexusSDK.podspec b/AppNexusSDK.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "AppNexusSDK"
-  s.version      = "8.1.1"
+  s.version      = "8.2.0"
   s.platform     = :ios, "10.0"
 
   s.summary      = "AppNexus iOS Mobile Advertising SDK"
@@ -21,7 +21,7 @@ DESC
   s.subspec 'AppNexusSDK' do |subspec|
     subspec.source_files         = "sdk/sourcefiles/**/*.{h,m}"
     subspec.public_header_files  = "sdk/sourcefiles/public-headers/*.h"
-    subspec.resources            = "sdk/sourcefiles/**/*.{png,bundle,xib,nib,js,html,strings}","sdk/AppNexusSDK/SDK-Info.plist"   
+    subspec.resources            = "sdk/sourcefiles/**/*.{png,bundle,xib,nib,js,html,strings}","sdk/AppNexusSDK/SDK-Info.plist"
     subspec.vendored_frameworks   =  "sdk/sourcefiles/Viewability/OMSDK_Appnexus.xcframework"
     subspec.frameworks           = 'WebKit'
     subspec.pod_target_xcconfig = { "VALID_ARCHS[sdk=iphoneos*]": "arm64 armv7", "VALID_ARCHS[sdk=iphonesimulator*]": "x86_64 arm64" }
@@ -39,11 +39,11 @@ DESC
 
   s.subspec 'FacebookCSRAdapter' do |subspec|
     subspec.dependency  'AppNexusSDK/AppNexusSDK', "#{s.version}"
-    subspec.dependency 'FBAudienceNetwork', '6.5.0'
+    subspec.dependency 'FBAudienceNetwork', '6.12.0'
     subspec.source_files         = "csr/Facebook/*.{h,m}"
     subspec.public_header_files  = "csr/Facebook/*.h"
     subspec.xcconfig              = { 'FRAMEWORK_SEARCH_PATHS' => '${PODS_ROOT}/FBAudienceNetwork/**' }
-  end 
+  end
 
   s.subspec 'SmartAdAdapter' do |subspec|
     subspec.dependency 'AppNexusSDK/AppNexusSDK', "#{s.version}"

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,9 +1,19 @@
+## 8.2.0
+
+### Improvement/Bug Fixes
++ MS-5172 Support for Global Privacy Platform (GPP) [https://docs.xandr.com/bundle/mobile-sdk/page/sdk-privacy-for-ios.html]
++ MS-5112 Update PPID API to indicate if its first party id [https://docs.xandr.com/bundle/mobile-sdk/page/user-id-s--mapping-on-ios.html]
++ MS-5183 Fixed Completion handler callback issues in XandrAd.init()
+
+### Mediation / CSR partner updates
++ MS-5195 Upgraded Facebook Audience Network SDK from 6.5.0 to 6.12.0
+
 ## 8.1.1
 
 ### Improvement/Bug Fixes for macOS SDK
 + MS-5127 Added Impression tracking API for NSView registerViewTracking  
 + MS-5128 Code optimizations
-+ MS-5149 Fixed Impression tracking issue when app is on secondary displays 
++ MS-5149 Fixed Impression tracking issue when app is on secondary displays
 
 ## 8.1.0
 
@@ -31,7 +41,7 @@ We have completed the removal of the APIs referenced in the 7.21.0 release. Plea
 
 ### Announcements:
 This will be the last major release in SDK v7.x.x series.
-The next major release will be SDK v8.0.0 which will include some breaking changes as proposed in Intent to Implement's listed below along with other changes. 
+The next major release will be SDK v8.0.0 which will include some breaking changes as proposed in Intent to Implement's listed below along with other changes.
 
 1. Xandr SDK v8.0.0 Removal Notice for Deprecated APIs [https://github.com/appnexus/mobile-sdk-ios/issues/77]
 2. Xandr will be moving toward counting "Viewable Impressions - for Direct-Sold Inventory" [https://github.com/appnexus/mobile-sdk-ios/issues/79]
@@ -75,11 +85,11 @@ We Intent to remove all the deprecated API's listed below in Xandr SDK v8.0. I
 ## 7.20.0
 ### Improvement/Bug Fixes
 + MS-4952 Check navigationType when opening a URL [Github PR #73]
-+ MS-4851 Improved OMSDK performance 
++ MS-4851 Improved OMSDK performance
 
 ## 7.19.0
 ### Improvement/Bug Fixes
-+ MS-4884 Improved impression tracking methodology for Native Ads, trackers to be fired on render 
++ MS-4884 Improved impression tracking methodology for Native Ads, trackers to be fired on render
 
 ## 7.18.0
 ### New Features:
@@ -126,7 +136,7 @@ We Intent to remove all the deprecated API's listed below in Xandr SDK v8.0. I
 * MS-4761 Added a new API to enable subscription to SDK logs for debugging/troubleshooting purposes. https://docs.xandr.com/bundle/mobile-sdk/page/configure-sdk-logging-on-ios.html
 * MS-4711 Exposed API in Custom element to support clickUrl and clickFallbackUrl for Native Ad. https://docs.xandr.com/bundle/mobile-sdk/page/show-native-ads-on-ios.html
 ### Improvements/Bug Fixes
-* MS-4753 Resolved a stability issue in Interstitial Ad due to [UIApplication.windows] being nil during Application launch 
+* MS-4753 Resolved a stability issue in Interstitial Ad due to [UIApplication.windows] being nil during Application launch
 * MS-4769 Removed duplicate calls to dispatch_async function from a couple of places
 
 
@@ -287,7 +297,7 @@ We Intent to remove all the deprecated API's listed below in Xandr SDK v8.0. I
 
 ## 7.1
 ### New Feature
-+ MS-3956  Added ANAdResponseInfo to return associated data with Ad response 
++ MS-3956  Added ANAdResponseInfo to return associated data with Ad response
 
 ### Mediation partner upgrade
 + Google AdMob SDK v7.55.0
@@ -318,7 +328,7 @@ We Intent to remove all the deprecated API's listed below in Xandr SDK v8.0. I
 + 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-4124: Special characters not rendering over native assembly
 + MS-4084: VideoAd Object not getting deallocated
 + MS-4095: Updated OMID partner name
 
@@ -342,15 +352,15 @@ We Intent to remove all the deprecated API's listed below in Xandr SDK v8.0. I
 
 ### 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 
++ 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-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
@@ -422,12 +432,12 @@ https://wiki.appnexus.com/display/sdk/iOS+v6.0+SDK+Migration+and+Integration#iOS
 + MS-3778: Added new API to get Video Orientation for BannerVideo and Video Ads
 
 ### Mediation partner upgrades/changes
-+  Removed support for following mediation Adapter 
++  Removed support for following mediation Adapter
     + AdColony SDK
     + AdMarvel SDK
     + Chartboost SDK
-    + Vdopia SDK 
-    + Vungle SDK 
+    + Vdopia SDK
+    + Vungle SDK
     + Yahoo SDK
 
 ### Improvements/Bug Fixes
@@ -505,7 +515,7 @@ Known issue: Apps integrating Smart Adapter from Code/Binary need to remove i386
 + Prevent crashes by preventing ANBannerAdView from loading when width or height are improperly configured (MS-3685)
 
 ## 4.12
-###  New Features and Bug Fixes 
+###  New Features and Bug Fixes
 + MS-3606: Updated Smart Adapter to v6.10
 + MS-3495: Updated Google Play Ad Adapter (AdMob & DFP) to v7.35.1
 + MS-3633: Added new APIs that expose additional description (`desc2`) and main image size for Native Ads
@@ -514,12 +524,12 @@ Known issue: Apps integrating Smart Adapter from Code/Binary need to remove i386
 Known Issue: Rubicon Mediation Adapter compatibility issues with iOS 12.0 - to be fixed in a future release.
 
 ## 4.11.1
-###  New Features and Bug Fixes 
-+ MS-3527: Attempt to prevent crash in OMIDAppnexusScriptInjector by error checking all MobileSDK inputs and by serializing global properties shared between threads. 
+###  New Features and Bug Fixes
++ MS-3527: Attempt to prevent crash in OMIDAppnexusScriptInjector by error checking all MobileSDK inputs and by serializing global properties shared between threads.
 + MS-3461: Update logic to center video display when video player is expanded to fill the full screen of the device.
- 
+
 ## 4.11
-###  New Features and Bug Fixes 
+###  New Features and Bug Fixes
 + MS-3401: Added an API for enabling/disabling the location access to the creative.
 + MS-3518: Updated the AppNexus GDPR constants to avoid namespace collisions with other SDKs implementing GDPR.
 + MS-3323: Updated SDK Localization for In-app browser's "OK" Button.

diff --git a/examples/ObjectiveC/SimpleIntegration/SimpleIntegrationObjC/AppDelegate.m b/examples/ObjectiveC/SimpleIntegration/SimpleIntegrationObjC/AppDelegate.m
@@ -25,7 +25,13 @@ @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions{
 
-    [[XandrAd sharedInstance] initWithMemberID:1234 preCacheRequestObjects:YES completionHandler:nil];
+    [[XandrAd sharedInstance] initWithMemberID:1234 preCacheRequestObjects:YES completionHandler:^(BOOL success){
+        if(success){
+          NSLog(@"Completion is called with status success ");
+        }else{
+          NSLog(@"Completion is called with status failed ");
+        }
+    }];
     return YES;
 }
 

diff --git a/examples/SimpleMediation/SimpleMediation.xcodeproj/project.pbxproj b/examples/SimpleMediation/SimpleMediation.xcodeproj/project.pbxproj
@@ -249,8 +249,8 @@
 		0E82E4EF245CCA5600EC19E1 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				0E82E4F4245CCA5600EC19E1 /* AppNexusSDK.framework */,
 				0E82E4F6245CCA5600EC19E1 /* AppNexusNativeSDK.framework */,
+				0E82E4F4245CCA5600EC19E1 /* AppNexusSDK.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -613,14 +613,14 @@
 				0EE0D04A23FD723800D0C060 /* AdmobDFPBannerAdViewController.swift in Sources */,
 				0EE0D04C23FD728200D0C060 /* AdmobDFPInterstitialAdViewController.swift in Sources */,
 				0EE0D06623FD764800D0C060 /* AdMobDFPNativeViewController.swift in Sources */,
-				8895CB932835618A00CF5993 /* ANAdAdapterNativeAdMob.swift in Sources */,
-				0EE0D0C323FD7E0100D0C060 /* ANAdAdapterBannerSmartAd.m in Sources */,
 				883D7B5B2833C714004C2757 /* ANAdAdapterBannerAdMob.swift in Sources */,
+				0EE0D0C323FD7E0100D0C060 /* ANAdAdapterBannerSmartAd.m in Sources */,
+				8895CB922835618A00CF5993 /* ANAdAdapterInterstitialAdMob.swift in Sources */,
 				0EE0D0C523FD7E0100D0C060 /* ANAdAdapterInterstitialSmartAd.m in Sources */,
+				8895CB932835618A00CF5993 /* ANAdAdapterNativeAdMob.swift in Sources */,
 				0EE0D0C423FD7E0100D0C060 /* ANAdAdapterSmartAdBase.m in Sources */,
 				0E5660EA23BE39AF0088EB36 /* AppDelegate.swift in Sources */,
 				0E5B044023BF618800DEBACE /* SimpleMediationAdTypeListViewController.swift in Sources */,
-				8895CB922835618A00CF5993 /* ANAdAdapterInterstitialAdMob.swift in Sources */,
 				0EE0D05B23FD72A200D0C060 /* SmartAdBannerAdViewController.swift in Sources */,
 				0EE0D05C23FD72A200D0C060 /* SmartAdInterstitialAdViewController.swift in Sources */,
 				0EE0D04523FD6EB300D0C060 /* Toast.swift in Sources */,

diff --git a/examples/Swift/SimpleIntegration/SimpleIntegrationSwift.xcodeproj/project.pbxproj b/examples/Swift/SimpleIntegration/SimpleIntegrationSwift.xcodeproj/project.pbxproj
@@ -183,19 +183,19 @@
 		0E877A5323FE763000DC962F = {
 			isa = PBXGroup;
 			children = (
-				88CD456A28B9143C00381778 /* AppNexusSDK.xcodeproj */,
-				88CD454F28B9136800381778 /* MacOSSimpleIntegrationSwift */,
 				0E877A7C23FE78B200DC962F /* Frameworks */,
+				88CD454F28B9136800381778 /* MacOSSimpleIntegrationSwift */,
 				0E877A5D23FE763000DC962F /* Products */,
 				0E877A5E23FE763000DC962F /* SimpleIntegrationSwift */,
+				88CD456A28B9143C00381778 /* AppNexusSDK.xcodeproj */,
 			);
 			sourceTree = "<group>";
 		};
 		0E877A5D23FE763000DC962F /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				0E877A5C23FE763000DC962F /* SimpleIntegrationSwift.app */,
 				88CD454E28B9136800381778 /* MacOSSimpleIntegrationSwift.app */,
+				0E877A5C23FE763000DC962F /* SimpleIntegrationSwift.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -227,24 +227,24 @@
 			isa = PBXGroup;
 			children = (
 				88CD455028B9136800381778 /* AppDelegate.swift */,
-				88CD455228B9136800381778 /* ViewController.swift */,
+				88CD455428B9136B00381778 /* Assets.xcassets */,
+				88CD455928B9136B00381778 /* MacOSSimpleIntegrationSwift.entitlements */,
+				88CD455628B9136B00381778 /* Main.storyboard */,
 				88CD458228B9191E00381778 /* NativeAdViewFirst.swift */,
 				88A94A7D28E1F5DF002EFB87 /* NativeAdViewSecond.swift */,
 				88CD458328B9191E00381778 /* quotes.json */,
+				88CD455228B9136800381778 /* ViewController.swift */,
 				88CD458428B9191E00381778 /* WindowController.swift */,
-				88CD455428B9136B00381778 /* Assets.xcassets */,
-				88CD455628B9136B00381778 /* Main.storyboard */,
-				88CD455928B9136B00381778 /* MacOSSimpleIntegrationSwift.entitlements */,
 			);
 			path = MacOSSimpleIntegrationSwift;
 			sourceTree = "<group>";
 		};
 		88CD456B28B9143C00381778 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				88CD457128B9143C00381778 /* AppNexusSDK.framework */,
-				88CD457328B9143C00381778 /* AppNexusNativeSDK.framework */,
 				88CD457528B9143C00381778 /* AppNexusNativeMacOSSDK.framework */,
+				88CD457328B9143C00381778 /* AppNexusNativeSDK.framework */,
+				88CD457128B9143C00381778 /* AppNexusSDK.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -402,11 +402,11 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				88CD455328B9136800381778 /* ViewController.swift in Sources */,
-				88CD458728B9191E00381778 /* WindowController.swift in Sources */,
 				88CD455128B9136800381778 /* AppDelegate.swift in Sources */,
-				88A94A8128E1F5DF002EFB87 /* NativeAdViewSecond.swift in Sources */,
 				88CD458528B9191E00381778 /* NativeAdViewFirst.swift in Sources */,
+				88A94A8128E1F5DF002EFB87 /* NativeAdViewSecond.swift in Sources */,
+				88CD455328B9136800381778 /* ViewController.swift in Sources */,
+				88CD458728B9191E00381778 /* WindowController.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/script/runTrackerXcodeTests.sh b/script/runTrackerXcodeTests.sh
@@ -89,7 +89,7 @@ USAGE_DETAILS="
 
         -help           Print these details.
 
-        
+
         Only project_directory is mandatory.
 
         If -dynamicInputs is not given and either -scheme or -versionDevice are missing, then these values
@@ -99,7 +99,7 @@ USAGE_DETAILS="
         All commandline or static inputs are checked against current Xcode config (dynamic inputs), to be sure they are valid.
 
         Results are logged in the directory of the Xcode project file.
-        
+
         SEE ALSO -- https://corpwiki.xandr-services.com/display/CT/Consistent+and+Reliable+Automated+Testing+with+Jenkins+for+iOS+Commits
   "
 
@@ -188,8 +188,9 @@ STATIC_LIST_OF_VERSIONS_AND_DEVICES="
     #13.5,iPhone_8
     #13.5,iPhone_8_Plus
     #13.5,iPhone_SE
-    14.4,iPhone_11
+    #14.4,iPhone_11
     14.4,iPhone_12
+    16.1,iPhone_14_Pro_Max
 "
 
 
@@ -264,10 +265,10 @@ runXcodebuild()   # <scheme> <iosVersion> <deviceModel>
   TEST_RESULT_CURRENT_FILE="$TEST_RESULT_DIRECTORY/${TEST_RESULT_CURRENT_FILE_PREFIX}${IOSVERSION},${DEVICEMODEL}--${SCHEME}.txt"
 
   eval $CMD 2>&1  | tee $TEST_RESULT_CURRENT_FILE
-  
+
   cat $TEST_RESULT_CURRENT_FILE | egrep '^(Test Suite|[     ]+Executed)'  >$TEST_RESULT_TEMP
   cat $TEST_RESULT_CURRENT_FILE | egrep -v '===' | $XCPRETTY -r html -o $TEST_RESULT_DIRECTORY_PRETTY/${IOSVERSION},${DEVICEMODEL}--${SCHEME}.html
-  
+
   EXPECTED_FAILED_NUMBER=$(cat $TEST_RESULT_TEMP | egrep -c "'All tests' failed")
 
   cat $TEST_RESULT_TEMP  >>$TEST_RESULT_LOG
@@ -321,7 +322,7 @@ isOptionTokenOrEmptyString()  # <token>
 
   #
   [ -z "$TOKEN" ] && { return 1; }
-  
+
   #
   RVAL=$(expr "$TOKEN" : "\-")
   [ "$RVAL" = "0" ]
@@ -508,7 +509,7 @@ setPathToResultsDirectoryAndLogFiles()
     post error "setPathToResultsDirectoryAndLogFiles(): PROJECT_DIRECTORY is undefined."
     exit 1
   }
-  
+
   #
   TEST_RESULT_DIRECTORY="$PROJECT_DIRECTORY/$TEST_RESULT_DIRECTORY"
   TEST_RESULT_DIRECTORY_PRETTY="$TEST_RESULT_DIRECTORY/$TEST_RESULT_DIRECTORY_PRETTY"
@@ -600,7 +601,7 @@ while [ "$1" ]; do
         PROJECT_DIRECTORY=${PROJECT_DIRECTORY:-"./"}
                                         ;;
   esac
-  
+
   shift
 done
 
@@ -667,17 +668,17 @@ setPathToResultsDirectoryAndLogFiles
       }
   done
 
-  for vd in $VERSIONS_AND_DEVICES; do
-    isSharped "$vd"
-    [ $? -eq 0 ] && continue
-
-    isValidVersionDevice $vd
-    [ "$?" -ne 0 ] && {
-      post error "Version+device tuple is UNRECOGNIZED by Xcode.  ($vd)"
-      echo
-      postUsageAndExit;
-    }
-  done
+  # for vd in $VERSIONS_AND_DEVICES; do
+  #   isSharped "$vd"
+  #   [ $? -eq 0 ] && continue
+  #
+  #   isValidVersionDevice $vd
+  #   [ "$?" -ne 0 ] && {
+  #     post error "Version+device tuple is UNRECOGNIZED by Xcode.  ($vd)"
+  #     echo
+  #     postUsageAndExit;
+  #   }
+  # done
 }
 
 
@@ -715,4 +716,3 @@ else
   log "#------- ALL TESTCASES PASSED"
   exit 0
 fi
-