From 9bca2b0666044a21e23cdd60d544c958858076f7 Mon Sep 17 00:00:00 2001 From: Abhishek Sharma Date: Fri, 4 Sep 2020 09:23:43 +0000 Subject: [PATCH 1/3] Rollback App Tracking Transparency Squashed commit of the following: commit 14cb45f7851526b29b89ed81c227812dce9efcaa Author: abhisheksharma Date: Fri Sep 4 02:17:13 2020 +0530 Rollback iOS14 --- sdk/sourcefiles/internal/ANGlobal.m | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/sdk/sourcefiles/internal/ANGlobal.m b/sdk/sourcefiles/internal/ANGlobal.m index dd005d0ac..bc9743644 100644 --- a/sdk/sourcefiles/internal/ANGlobal.m +++ b/sdk/sourcefiles/internal/ANGlobal.m @@ -23,9 +23,7 @@ #import "ANOMIDImplementation.h" #import "ANWebView.h" #import "ANGDPRSettings.h" -#if __has_include() - #import -#endif + NSString * __nonnull const ANInternalDelgateTagKeyPrimarySize = @"ANInternalDelgateTagKeyPrimarySize"; NSString * __nonnull const ANInternalDelegateTagKeySizes = @"ANInternalDelegateTagKeySizes"; @@ -57,15 +55,6 @@ BOOL ANAdvertisingTrackingEnabled() { // - Estimating number of unique users // - Security and fraud detection // - Debugging - if (@available(iOS 14, *)) { -#if __has_include() - if ([ATTrackingManager trackingAuthorizationStatus] == ATTrackingManagerAuthorizationStatusAuthorized){ - return true; - }else{ - return false; - } -#endif - } return [ASIdentifierManager sharedManager].isAdvertisingTrackingEnabled; } From d097b13cce1c51249295dfe904c2b330f471c86f Mon Sep 17 00:00:00 2001 From: abhisheksharma Date: Fri, 4 Sep 2020 17:27:57 +0530 Subject: [PATCH 2/3] v7.6.1 --- AppNexusSDK.podspec | 2 +- sdk/AppNexusSDK.xcodeproj/project.pbxproj | 8 ++++---- sdk/sourcefiles/internal/ANGlobal.h | 2 +- tests/UnitTestApp/UnitTestApp.xcodeproj/project.pbxproj | 7 +------ 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/AppNexusSDK.podspec b/AppNexusSDK.podspec index 538b75716..36601d62e 100644 --- a/AppNexusSDK.podspec +++ b/AppNexusSDK.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "AppNexusSDK" - s.version = "7.6" + s.version = "7.6.1" s.platform = :ios, "9.0" s.summary = "AppNexus iOS Mobile Advertising SDK" diff --git a/sdk/AppNexusSDK.xcodeproj/project.pbxproj b/sdk/AppNexusSDK.xcodeproj/project.pbxproj index 340457240..ff7dd483e 100644 --- a/sdk/AppNexusSDK.xcodeproj/project.pbxproj +++ b/sdk/AppNexusSDK.xcodeproj/project.pbxproj @@ -1526,7 +1526,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ""; - MARKETING_VERSION = 7.6; + MARKETING_VERSION = 7.6.1; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_BUNDLE_IDENTIFIER = "corp.appnexus.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1563,7 +1563,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ""; - MARKETING_VERSION = 7.6; + MARKETING_VERSION = 7.6.1; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "corp.appnexus.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1715,7 +1715,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ""; - MARKETING_VERSION = 7.6; + MARKETING_VERSION = 7.6.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.appnexus.AppNexusNativeSDK; @@ -1760,7 +1760,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; LIBRARY_SEARCH_PATHS = ""; - MARKETING_VERSION = 7.6; + MARKETING_VERSION = 7.6.1; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.appnexus.AppNexusNativeSDK; diff --git a/sdk/sourcefiles/internal/ANGlobal.h b/sdk/sourcefiles/internal/ANGlobal.h index 8cc3ae030..ddf94d69e 100644 --- a/sdk/sourcefiles/internal/ANGlobal.h +++ b/sdk/sourcefiles/internal/ANGlobal.h @@ -26,7 +26,7 @@ #define AN_ERROR_TABLE @"errors" #define AN_DEFAULT_PLACEMENT_ID @"default_placement_id" -#define AN_SDK_VERSION @"7.6" +#define AN_SDK_VERSION @"7.6.1" #define APPNEXUS_BANNER_SIZE CGSizeMake(320, 50) diff --git a/tests/UnitTestApp/UnitTestApp.xcodeproj/project.pbxproj b/tests/UnitTestApp/UnitTestApp.xcodeproj/project.pbxproj index 67b480606..75ef72df1 100644 --- a/tests/UnitTestApp/UnitTestApp.xcodeproj/project.pbxproj +++ b/tests/UnitTestApp/UnitTestApp.xcodeproj/project.pbxproj @@ -397,10 +397,10 @@ 0EEFE1F8220098BD002B5F5F /* ANMockMediationAdapterLoadThenFail.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EEFE1F7220098BD002B5F5F /* ANMockMediationAdapterLoadThenFail.m */; }; 0EEFE1FB220098C9002B5F5F /* ANMockMediationAdapterLoadAndHitOtherCallbacks.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EEFE1FA220098C9002B5F5F /* ANMockMediationAdapterLoadAndHitOtherCallbacks.m */; }; 0EEFE1FD22009CDB002B5F5F /* OMID_TestResponse.json in Resources */ = {isa = PBXBuildFile; fileRef = 0EEFE1FC22009CDB002B5F5F /* OMID_TestResponse.json */; }; + 0EFE016F2498473D00284F49 /* TestANCSRUniversalFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E9EBD6924336111001A30D8 /* TestANCSRUniversalFetcher.m */; }; 3812956C24AA1B4000116AAB /* CSR_Facebook_Banner_Native_AdDidLogImpression.json in Resources */ = {isa = PBXBuildFile; fileRef = 3812956A24AA1B4000116AAB /* CSR_Facebook_Banner_Native_AdDidLogImpression.json */; }; 3812956E24AA1E7000116AAB /* ANNativeAdDidLogImpressionAPITestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 3812956D24AA1E7000116AAB /* ANNativeAdDidLogImpressionAPITestCase.m */; }; 3812957024AA255900116AAB /* SuccessfulNativeStandardAdResponse.json in Resources */ = {isa = PBXBuildFile; fileRef = 0EEFE17B22007497002B5F5F /* SuccessfulNativeStandardAdResponse.json */; }; - 0EFE016F2498473D00284F49 /* TestANCSRUniversalFetcher.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E9EBD6924336111001A30D8 /* TestANCSRUniversalFetcher.m */; }; 38904C4424E1309B00A472CC /* ANAdResponseCodeTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 38904C4324E1309B00A472CC /* ANAdResponseCodeTestCase.m */; }; 38A8E164248A6A7E0081E9CD /* CSR_Facebook_Banner_Native_withError_1002.json in Resources */ = {isa = PBXBuildFile; fileRef = 38A8E15B248A6A7C0081E9CD /* CSR_Facebook_Banner_Native_withError_1002.json */; }; 38A8E165248A6A7E0081E9CD /* CSR_Facebook_Banner_Native_withError_1012.json in Resources */ = {isa = PBXBuildFile; fileRef = 38A8E15D248A6A7C0081E9CD /* CSR_Facebook_Banner_Native_withError_1012.json */; }; @@ -437,8 +437,6 @@ 607BB64723F32860002A0F57 /* testMARCombinationTwoRTBNative.json in Resources */ = {isa = PBXBuildFile; fileRef = 0E2B4BAC23C4AD6E002AFBD8 /* testMARCombinationTwoRTBNative.json */; }; 607BB64823F32936002A0F57 /* ANNativeAdRequest+ANTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EEFE19922008124002B5F5F /* ANNativeAdRequest+ANTest.m */; }; 607BB65B240461F3002A0F57 /* GoogleMobileAds.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 607BB65A240461F3002A0F57 /* GoogleMobileAds.framework */; }; - 607BB65C240461F3002A0F57 /* GoogleMobileAds.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 607BB65A240461F3002A0F57 /* GoogleMobileAds.framework */; }; - 607BB65D240461F3002A0F57 /* GoogleMobileAds.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 607BB65A240461F3002A0F57 /* GoogleMobileAds.framework */; }; 60D39E46226F69A80029F741 /* ANVideoPlayerSettingsTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 60D39E44226F69A80029F741 /* ANVideoPlayerSettingsTestCase.m */; }; 60F8A7FF23280BF10030D53D /* ANReachability+ANTest.h in Sources */ = {isa = PBXBuildFile; fileRef = 0E8C971F21FF32EB005D1F0E /* ANReachability+ANTest.h */; }; 60F8A80023280C2A0030D53D /* ANReachability+ANTest.h in Sources */ = {isa = PBXBuildFile; fileRef = 0E8C971F21FF32EB005D1F0E /* ANReachability+ANTest.h */; }; @@ -1117,8 +1115,6 @@ files = ( 0E6B7E4522D8DE01005D069E /* AppNexusSDK.framework in Frameworks */, 0E5529BA2419228C00D50C51 /* FBAudienceNetwork.framework in Frameworks */, - 607BB65C240461F3002A0F57 /* GoogleMobileAds.framework in Frameworks */, - 607BB65C240461F3002A0F57 /* GoogleMobileAds.framework in Frameworks */, 0E56C83521F8B2A900ADE6E1 /* XCTest.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1128,7 +1124,6 @@ buildActionMask = 2147483647; files = ( 0E6B7E4622D8DE06005D069E /* AppNexusSDK.framework in Frameworks */, - 607BB65D240461F3002A0F57 /* GoogleMobileAds.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; From e726c3cef476da0df5b6301b1cfd18153ac4a2aa Mon Sep 17 00:00:00 2001 From: abhisheksharma Date: Fri, 4 Sep 2020 21:17:42 +0530 Subject: [PATCH 3/3] Added Release notes v7.6.1 --- RELEASE-NOTES.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index e2b424091..5afbab2e6 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,3 +1,7 @@ +## 7.6.1 +### Improvements/Bug Fixes ++ MS-4520: Rollback iOS 14 AppTrackingTransparency changes (Please refer https://wiki.xandr.com/x/3Ie1Bg for the latest updates on Xandr Mobile SDK's support for iOS 14) + ## 7.6 ### New Features + MS-4433: Support for iOS 14 [https://wiki.xandr.com/x/3Ie1Bg]