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/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 {