switch to 13 ios, try Apple Silicon CI runner

criteo · May 16, 2024 · b3facf0 · b3facf0
1 parent 6c7e25a
commit b3facf0
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 15 deletions.
diff --git a/.github/workflows/release-cocoapods.yml b/.github/workflows/release-cocoapods.yml
@@ -9,7 +9,7 @@ env:
 
 jobs:
   release-cocoapods:
-    runs-on: macos-12
+    runs-on: macos-13-xlarge
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/release-github.yml b/.github/workflows/release-github.yml
@@ -12,7 +12,7 @@ env:
 jobs:
   test-and-release:
     # Clone of main test workflow
-    runs-on: macos-12
+    runs-on: macos-13-xlarge
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/test_0.yml b/.github/workflows/test_0.yml
@@ -13,7 +13,7 @@ env:
 
 jobs:
   test:
-    runs-on: macos-12
+    runs-on: macos-13-xlarge
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/test_1.yml b/.github/workflows/test_1.yml
@@ -13,7 +13,7 @@ env:
 
 jobs:
   test:
-    runs-on: macos-12
+    runs-on: macos-13-xlarge
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/test_2.yml b/.github/workflows/test_2.yml
@@ -13,7 +13,7 @@ env:
 
 jobs:
   test:
-    runs-on: macos-12
+    runs-on: macos-13-xlarge
 
     steps:
       - name: Checkout

diff --git a/CriteoAdViewer/CriteoAdViewer.xcodeproj/project.pbxproj b/CriteoAdViewer/CriteoAdViewer.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -669,6 +669,7 @@
 					"$(PROJECT_DIR)/**",
 				);
 				INFOPLIST_FILE = Sources/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -709,6 +710,7 @@
 					"$(PROJECT_DIR)/**",
 				);
 				INFOPLIST_FILE = Sources/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

diff --git a/CriteoGoogleAdapter/CriteoGoogleAdapter.xcodeproj/project.pbxproj b/CriteoGoogleAdapter/CriteoGoogleAdapter.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -535,7 +535,7 @@
 				);
 				INFOPLIST_FILE = Sources/CriteoGoogleAdapter/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -568,7 +568,7 @@
 				);
 				INFOPLIST_FILE = Sources/CriteoGoogleAdapter/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

diff --git a/CriteoPublisherSdk.podspec b/CriteoPublisherSdk.podspec
@@ -39,10 +39,6 @@ Pod::Spec.new do |spec|
     adapter.source_files     = "CriteoGoogleAdapter/Sources/**/*.{h,m}"
     adapter.dependency         "CriteoPublisherSdk/Sdk"
     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' }
-    adapter.user_target_xcconfig  = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64 arm64e armv7 armv7s i386', 'EXCLUDED_ARCHS[sdk=iphoneos*]' => 'i386 x86_64' }
   end
 
 

diff --git a/CriteoPublisherSdk/CriteoPublisherSdk.xcodeproj/project.pbxproj b/CriteoPublisherSdk/CriteoPublisherSdk.xcodeproj/project.pbxproj
@@ -2725,7 +2725,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -2785,7 +2785,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ env: @@
     jobs:
       test:
-        runs-on: macos-12
+        runs-on: macos-13-xlarge
         steps:
           - name: Checkout
@@ Expand Down @@