diff --git a/.github/workflows/release-cocoapods.yml b/.github/workflows/release-cocoapods.yml
index 2558b427..8a960c58 100644
--- a/.github/workflows/release-cocoapods.yml
+++ b/.github/workflows/release-cocoapods.yml
@@ -5,15 +5,15 @@ on:
types: [ published ]
env:
- DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
+ DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer
jobs:
release-cocoapods:
- runs-on: macos-12
+ runs-on: macos-latest
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Ruby & Bundle setup
uses: ruby/setup-ruby@v1
diff --git a/.github/workflows/release-github.yml b/.github/workflows/release-github.yml
index b9038cf6..61ec81b5 100644
--- a/.github/workflows/release-github.yml
+++ b/.github/workflows/release-github.yml
@@ -7,16 +7,16 @@ on:
- '[0-9]+.[0-9]+.[0-9]+-[a-z]+[0-9]+'
env:
- DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
+ DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer
jobs:
test-and-release:
# Clone of main test workflow
- runs-on: macos-12
+ runs-on: macos-latest
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Ruby & Bundle setup
uses: ruby/setup-ruby@v1
@@ -53,10 +53,10 @@ jobs:
bundle exec fastlane format_check
- name: Tests reports upload
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
if: failure()
with:
- name: tests-reports
+ name: tests-reports-${{ matrix.runs-on }}
path: "fastlane/test_output"
# Publish additional steps to test job
diff --git a/.github/workflows/test_0.yml b/.github/workflows/test_0.yml
index 596d0e54..0f79a11c 100644
--- a/.github/workflows/test_0.yml
+++ b/.github/workflows/test_0.yml
@@ -9,15 +9,15 @@ on:
workflow_dispatch:
env:
- DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
+ DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer
jobs:
test:
- runs-on: macos-12
+ runs-on: macos-latest
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Ruby & Bundle setup
uses: ruby/setup-ruby@v1
@@ -58,8 +58,8 @@ jobs:
bundle exec fastlane test_0
- name: Tests reports upload
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
if: failure()
with:
- name: tests-reports
+ name: tests-reports-${{ matrix.runs-on }}
path: "fastlane/test_output"
diff --git a/.github/workflows/test_1.yml b/.github/workflows/test_1.yml
index 54b1bb25..14f6cc72 100644
--- a/.github/workflows/test_1.yml
+++ b/.github/workflows/test_1.yml
@@ -9,15 +9,15 @@ on:
workflow_dispatch:
env:
- DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
+ DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer
jobs:
test:
- runs-on: macos-12
+ runs-on: macos-latest
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Ruby & Bundle setup
uses: ruby/setup-ruby@v1
@@ -58,8 +58,8 @@ jobs:
bundle exec fastlane test_1
- name: Tests reports upload
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
if: failure()
with:
- name: tests-reports
+ name: tests-reports-${{ matrix.runs-on }}
path: "fastlane/test_output"
diff --git a/.github/workflows/test_2.yml b/.github/workflows/test_2.yml
index a188c157..94e2ee0b 100644
--- a/.github/workflows/test_2.yml
+++ b/.github/workflows/test_2.yml
@@ -9,15 +9,15 @@ on:
workflow_dispatch:
env:
- DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
+ DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer
jobs:
test:
- runs-on: macos-12
+ runs-on: macos-latest
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Ruby & Bundle setup
uses: ruby/setup-ruby@v1
@@ -58,8 +58,8 @@ jobs:
bundle exec fastlane test_2
- name: Tests reports upload
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
if: failure()
with:
- name: tests-reports
+ name: tests-reports-${{ matrix.runs-on }}
path: "fastlane/test_output"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a16b8715..d14455f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,13 @@
# Criteo Publisher SDK Changelog
+--------------------------------------------------------------------------------
+## Version [6.1.2]
+
+### Features
+- Switch to macos-latest runner
+- Update checkout and upload actions to v4
+- Remove archs exclusion
+- Fix tests
+
--------------------------------------------------------------------------------
## Version [6.1.1]
diff --git a/CriteoAdViewer/Sources/Info.plist b/CriteoAdViewer/Sources/Info.plist
index 3cab2589..a5f07867 100644
--- a/CriteoAdViewer/Sources/Info.plist
+++ b/CriteoAdViewer/Sources/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 6.1.1
+ 6.1.2
CFBundleURLTypes
diff --git a/CriteoAdViewer/UITests/Info.plist b/CriteoAdViewer/UITests/Info.plist
index 21f403af..f4017cbd 100644
--- a/CriteoAdViewer/UITests/Info.plist
+++ b/CriteoAdViewer/UITests/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
BNDL
CFBundleShortVersionString
- 6.1.1
+ 6.1.2
CFBundleVersion
1
diff --git a/CriteoGoogleAdapter/Sources/CriteoGoogleAdapter/Info.plist b/CriteoGoogleAdapter/Sources/CriteoGoogleAdapter/Info.plist
index 9aff131f..05e22181 100644
--- a/CriteoGoogleAdapter/Sources/CriteoGoogleAdapter/Info.plist
+++ b/CriteoGoogleAdapter/Sources/CriteoGoogleAdapter/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 6.1.1
+ 6.1.2
CFBundleVersion
1
diff --git a/CriteoGoogleAdapter/Tests/CriteoGoogleAdapterTests/Info.plist b/CriteoGoogleAdapter/Tests/CriteoGoogleAdapterTests/Info.plist
index 21f403af..f4017cbd 100644
--- a/CriteoGoogleAdapter/Tests/CriteoGoogleAdapterTests/Info.plist
+++ b/CriteoGoogleAdapter/Tests/CriteoGoogleAdapterTests/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
BNDL
CFBundleShortVersionString
- 6.1.1
+ 6.1.2
CFBundleVersion
1
diff --git a/CriteoPublisherSdk.podspec b/CriteoPublisherSdk.podspec
index c5c56a77..a4ce7228 100644
--- a/CriteoPublisherSdk.podspec
+++ b/CriteoPublisherSdk.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = "CriteoPublisherSdk"
- spec.version = "6.1.1"
+ spec.version = "6.1.2-rc1"
spec.summary = "Criteo Publisher SDK for iOS"
spec.description = <<-DESC
@@ -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/Sources/Info.plist b/CriteoPublisherSdk/Sources/Info.plist
index 9aff131f..05e22181 100644
--- a/CriteoPublisherSdk/Sources/Info.plist
+++ b/CriteoPublisherSdk/Sources/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
FMWK
CFBundleShortVersionString
- 6.1.1
+ 6.1.2
CFBundleVersion
1
diff --git a/CriteoPublisherSdk/Sources/Public/CRConstants.h b/CriteoPublisherSdk/Sources/Public/CRConstants.h
index eecc08ce..f38768b7 100644
--- a/CriteoPublisherSdk/Sources/Public/CRConstants.h
+++ b/CriteoPublisherSdk/Sources/Public/CRConstants.h
@@ -20,7 +20,7 @@
#ifndef CRConstants_h
#define CRConstants_h
-#define CRITEO_PUBLISHER_SDK_VERSION @"6.1.1"
+#define CRITEO_PUBLISHER_SDK_VERSION @"6.1.2-rc1"
#define CRITEO_DEFAULT_REQUEST_TIMEOUT_IN_SECONDS 60
#define CRITEO_DEFAULT_BID_TTL_IN_SECONDS 15 * 60
diff --git a/CriteoPublisherSdk/Tests/CriteoPublisherSdkTests-Info.plist b/CriteoPublisherSdk/Tests/CriteoPublisherSdkTests-Info.plist
index 21f403af..f4017cbd 100644
--- a/CriteoPublisherSdk/Tests/CriteoPublisherSdkTests-Info.plist
+++ b/CriteoPublisherSdk/Tests/CriteoPublisherSdkTests-Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
BNDL
CFBundleShortVersionString
- 6.1.1
+ 6.1.2
CFBundleVersion
1
diff --git a/CriteoPublisherSdk/Tests/IntegrationTests/CRInterstitialDelegateTests.m b/CriteoPublisherSdk/Tests/IntegrationTests/CRInterstitialDelegateTests.m
index bc14dc8a..39b33c9d 100644
--- a/CriteoPublisherSdk/Tests/IntegrationTests/CRInterstitialDelegateTests.m
+++ b/CriteoPublisherSdk/Tests/IntegrationTests/CRInterstitialDelegateTests.m
@@ -739,11 +739,8 @@ - (void)testInterstitialDidLoadForValidBid {
dependencyProvider.displaySizeInjector = displaySizeInjector;
WKWebView *mockWebView = OCMClassMock([WKWebView class]);
- UIView *mockView = OCMClassMock([UIView class]);
CR_InterstitialViewController *interstitialVC =
- [[CR_InterstitialViewController alloc] initWithWebView:mockWebView
- view:mockView
- interstitial:nil];
+ [[CR_InterstitialViewController alloc] initWithWebView:mockWebView view:nil interstitial:nil];
CRInterstitialAdUnit *adUnit1 = [[CRInterstitialAdUnit alloc] initWithAdUnitId:@"Yo"];
CRInterstitialAdUnit *adUnit2 = [[CRInterstitialAdUnit alloc] initWithAdUnitId:@"Yo"];
CRInterstitial *interstitial =
diff --git a/CriteoPublisherSdk/Tests/UnitTests/Native/CRMediaViewTests.m b/CriteoPublisherSdk/Tests/UnitTests/Native/CRMediaViewTests.m
index b9c7f93e..4c166029 100644
--- a/CriteoPublisherSdk/Tests/UnitTests/Native/CRMediaViewTests.m
+++ b/CriteoPublisherSdk/Tests/UnitTests/Native/CRMediaViewTests.m
@@ -144,7 +144,7 @@ - (void)testSetMediaContent_GivenPlaceholderAndMultipleSuccessfulCall_SetPlaceho
#pragma mark - Private
- (UIImage *)imageWithWidth:(CGFloat)width {
- return [UIImage imageWithSize:(CGSize){width, 0}];
+ return [UIImage imageWithSize:(CGSize){width, 1}];
}
- (CRMediaView *)buildMediaView {
diff --git a/CriteoPublisherSdk/iTestHostApp/Info.plist b/CriteoPublisherSdk/iTestHostApp/Info.plist
index e289b174..1d75d2d2 100644
--- a/CriteoPublisherSdk/iTestHostApp/Info.plist
+++ b/CriteoPublisherSdk/iTestHostApp/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 6.1.1
+ 6.1.2
CFBundleVersion
1
LSRequiresIPhoneOS