update GAM SDK to 10.1.0, iOS target set to 12, disabled bitcode, cod…

…e formated
mflknr · Feb 27, 2023 · bfa3a3e · bfa3a3e
1 parent f2b8a84
commit bfa3a3e
Show file tree

Hide file tree

Showing 28 changed files with 313 additions and 257 deletions.
diff --git a/CriteoAdViewer/CriteoAdViewer.xcodeproj/project.pbxproj b/CriteoAdViewer/CriteoAdViewer.xcodeproj/project.pbxproj
@@ -567,7 +567,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -621,7 +621,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;

diff --git a/CriteoAdViewer/Sources/AppDelegate.swift b/CriteoAdViewer/Sources/AppDelegate.swift
@@ -18,9 +18,9 @@
 //
 
 import AppTrackingTransparency
-import UIKit
-import StoreKit
 import GoogleMobileAds
+import StoreKit
+import UIKit
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {

diff --git a/CriteoGoogleAdapter/CriteoGoogleAdapter.xcodeproj/project.pbxproj b/CriteoGoogleAdapter/CriteoGoogleAdapter.xcodeproj/project.pbxproj
@@ -411,7 +411,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MACH_O_TYPE = staticlib;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
@@ -468,7 +468,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MACH_O_TYPE = staticlib;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
@@ -499,7 +499,7 @@
 				);
 				INFOPLIST_FILE = Sources/CriteoGoogleAdapter/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -532,7 +532,7 @@
 				);
 				INFOPLIST_FILE = Sources/CriteoGoogleAdapter/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -558,7 +558,7 @@
 					"$(PROJECT_DIR)",
 				);
 				INFOPLIST_FILE = Tests/CriteoGoogleAdapterTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -585,7 +585,7 @@
 					"$(PROJECT_DIR)",
 				);
 				INFOPLIST_FILE = Tests/CriteoGoogleAdapterTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

diff --git a/CriteoPublisherSdk.podspec b/CriteoPublisherSdk.podspec
@@ -14,7 +14,7 @@ Pod::Spec.new do |spec|
   spec.author            = { "Criteo" => "[email protected]" }
 
   spec.platform              = :ios
-  spec.ios.deployment_target = "11.0"
+  spec.ios.deployment_target = "12.0"
   spec.swift_version         = "5.0"
   spec.static_framework      = true # Required by Google Sdk
 
@@ -35,7 +35,7 @@ Pod::Spec.new do |spec|
   spec.subspec "GoogleAdapter" do |adapter|
     adapter.source_files     = "CriteoGoogleAdapter/Sources/**/*.{h,m}"
     adapter.dependency         "CriteoPublisherSdk/Sdk"
-    adapter.dependency         "Google-Mobile-Ads-SDK", "~> 9.0"
+    adapter.dependency         "Google-Mobile-Ads-SDK", "~> 10.1.0"
 
     # Xcode 12 workaround: https://github.com/CocoaPods/CocoaPods/issues/10065
     adapter.pod_target_xcconfig   = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64 arm64e armv7 armv7s i386', 'EXCLUDED_ARCHS[sdk=iphoneos*]' => 'i386 x86_64' }

diff --git a/CriteoPublisherSdk/CriteoPublisherSdk.xcodeproj/project.pbxproj b/CriteoPublisherSdk/CriteoPublisherSdk.xcodeproj/project.pbxproj
@@ -2324,7 +2324,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Sources/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2352,7 +2352,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Sources/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2374,7 +2374,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = S655EV5659;
 				INFOPLIST_FILE = iTestHostApp/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2392,7 +2392,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = S655EV5659;
 				INFOPLIST_FILE = iTestHostApp/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2459,7 +2459,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -2518,7 +2518,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
@@ -2535,7 +2535,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = S655EV5659;
 				INFOPLIST_FILE = "Tests/CriteoPublisherSdkTests-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2559,7 +2559,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = S655EV5659;
 				INFOPLIST_FILE = "Tests/CriteoPublisherSdkTests-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

diff --git a/CriteoPublisherSdk/Sources/CR_BidManager.m b/CriteoPublisherSdk/Sources/CR_BidManager.m
@@ -213,9 +213,10 @@ - (void)fetchLiveBidForAdUnit:(CR_CacheAdUnit *)adUnit
     return;
   }
 
+  NSArray *adUnits = adUnit == nil ? [NSArray new] : [NSArray arrayWithObject:adUnit];
   [self.threadManager dispatchAsyncOnGlobalQueueWithTimeout:timeBudget
       operationHandler:^void(void (^completionHandler)(dispatchWithTimeoutHandler)) {
-        [self fetchBidsForAdUnits:@[ adUnit ]
+        [self fetchBidsForAdUnits:adUnits
                       withContext:contextData
                cdbResponseHandler:^(CR_CdbResponse *cdbResponse) {
                  completionHandler(^(BOOL handled) {

diff --git a/CriteoPublisherSdk/Sources/Cassette/CR_CASDefaultDataSerializer.m b/CriteoPublisherSdk/Sources/Cassette/CR_CASDefaultDataSerializer.m
@@ -28,21 +28,15 @@ - (instancetype)initPrivate {
 }
 
 - (id _Nullable)deserialize:(nonnull NSData *)data error:(NSError * _Nullable __autoreleasing * _Nullable)error {
-    if (@available(iOS 11.0, macOS 10.13, *)) {
-        NSKeyedUnarchiver *unarchiver = [[NSKeyedUnarchiver alloc] initForReadingFromData:data error:error];
-        [unarchiver setRequiresSecureCoding:NO];
-        return [unarchiver decodeObjectForKey:NSKeyedArchiveRootObjectKey];
-    } else {
-        return [NSKeyedUnarchiver unarchiveObjectWithData:data];
-    }
+    NSKeyedUnarchiver *unarchiver = [[NSKeyedUnarchiver alloc] initForReadingFromData:data error:error];
+    [unarchiver setRequiresSecureCoding:NO];
+    return [unarchiver decodeObjectForKey:NSKeyedArchiveRootObjectKey];
 }
 
 - (NSData * _Nullable)serialize:(nonnull id)object error:(NSError * _Nullable __autoreleasing * _Nullable)error {
-    if (@available(iOS 11.0, macOS 10.13, *)) {
-        return [NSKeyedArchiver archivedDataWithRootObject:object requiringSecureCoding:NO error:error];
-    } else {
-        return [NSKeyedArchiver archivedDataWithRootObject:object];
-    }
+    return [NSKeyedArchiver archivedDataWithRootObject:object
+                                 requiringSecureCoding:NO
+                                                 error:error];
 }
 
 @end
diff --git a/CriteoPublisherSdk/Sources/Context/CR_InternalContextProvider.m b/CriteoPublisherSdk/Sources/Context/CR_InternalContextProvider.m
@@ -73,7 +73,8 @@ - (CR_DeviceConnectionType)fetchDeviceConnectionType {
     if (networkInfo == nil) {
       networkInfo = [[CTTelephonyNetworkInfo alloc] init];
     }
-    NSString *accessTechnology = networkInfo.currentRadioAccessTechnology;
+    NSString *accessTechnology =
+        networkInfo.serviceCurrentRadioAccessTechnology.allValues.firstObject;
     if ([accessTechnology isEqualToString:CTRadioAccessTechnologyGPRS] ||
         [accessTechnology isEqualToString:CTRadioAccessTechnologyEdge] ||
         [accessTechnology isEqualToString:CTRadioAccessTechnologyCDMA1x] ||
@@ -199,4 +200,4 @@ - (CGFloat)screenScale {
   return [UIScreen mainScreen].scale;
 }
 
-@end
+@end
diff --git a/CriteoPublisherSdk/Sources/Feedback/CR_FeedbackFileManager.m b/CriteoPublisherSdk/Sources/Feedback/CR_FeedbackFileManager.m
@@ -67,24 +67,15 @@ - (instancetype)initWithFileManipulating:(id<CR_FileManipulating>)fileManipulati
 - (nullable CR_FeedbackMessage *)readFeedbackForFilename:(NSString *)filename {
   NSData *content =
       [self.fileManipulating readDataForAbsolutePath:[self buildAbsolutePathByFilename:filename]];
-  if (@available(iOS 11.0, *)) {
-    return [NSKeyedUnarchiver unarchivedObjectOfClass:CR_FeedbackMessage.class
-                                             fromData:content
-                                                error:nil];
-  } else {
-    return [NSKeyedUnarchiver unarchiveObjectWithData:content];
-  }
+  return [NSKeyedUnarchiver unarchivedObjectOfClass:CR_FeedbackMessage.class
+                                           fromData:content
+                                              error:nil];
 }
 
 - (void)writeFeedback:(CR_FeedbackMessage *)feedback forFilename:(NSString *)filename {
-  NSData *content = nil;
-  if (@available(iOS 11.0, *)) {
-    content = [NSKeyedArchiver archivedDataWithRootObject:feedback
-                                    requiringSecureCoding:NO
-                                                    error:nil];
-  } else {
-    content = [NSKeyedArchiver archivedDataWithRootObject:feedback];
-  }
+  NSData *content = [NSKeyedArchiver archivedDataWithRootObject:feedback
+                                          requiringSecureCoding:NO
+                                                          error:nil];
 
   NSString *feedbackPath = [self buildAbsolutePathByFilename:filename];
   if ([self.fileManipulating fileExistsAtPath:feedbackPath isDirectory:nil] ||