Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

switch to iOS 13 test #335

Closed
wants to merge 2 commits into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release-cocoapods.yml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ env:

jobs:
release-cocoapods:
runs-on: macos-12
runs-on: macos-13-large

steps:
- name: Checkout
2 changes: 1 addition & 1 deletion .github/workflows/release-github.yml
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ env:
jobs:
test-and-release:
# Clone of main test workflow
runs-on: macos-12
runs-on: macos-13-large

steps:
- name: Checkout
2 changes: 1 addition & 1 deletion .github/workflows/test_0.yml
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ env:

jobs:
test:
runs-on: macos-12
runs-on: macos-13-large

steps:
- name: Checkout
2 changes: 1 addition & 1 deletion .github/workflows/test_1.yml
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ env:

jobs:
test:
runs-on: macos-12
runs-on: macos-13-large

steps:
- name: Checkout
2 changes: 1 addition & 1 deletion .github/workflows/test_2.yml
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ env:

jobs:
test:
runs-on: macos-12
runs-on: macos-13-large

steps:
- name: Checkout
4 changes: 3 additions & 1 deletion CriteoAdViewer/CriteoAdViewer.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
@@ -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",
Original file line number Diff line number Diff line change
@@ -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",
4 changes: 0 additions & 4 deletions CriteoPublisherSdk.podspec
Original file line number Diff line number Diff line change
@@ -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


Original file line number Diff line number Diff line change
@@ -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;
Loading