From f7501df1f59a16c2f289192cfd11266146d6bdf0 Mon Sep 17 00:00:00 2001 From: Vitalii Pavlenko Date: Wed, 22 May 2024 16:35:37 +0200 Subject: [PATCH 01/10] test --- .github/workflows/release-cocoapods.yml | 6 +++--- .github/workflows/release-github.yml | 10 +++++----- .github/workflows/test_0.yml | 10 +++++----- .github/workflows/test_1.yml | 10 +++++----- .github/workflows/test_2.yml | 10 +++++----- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/release-cocoapods.yml b/.github/workflows/release-cocoapods.yml index 2558b427..80faa3a6 100644 --- a/.github/workflows/release-cocoapods.yml +++ b/.github/workflows/release-cocoapods.yml @@ -9,14 +9,14 @@ env: 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 + uses: ruby/setup-ruby@v1.176.0 with: ruby-version: 2.7 bundler-cache: true diff --git a/.github/workflows/release-github.yml b/.github/workflows/release-github.yml index b9038cf6..421834dd 100644 --- a/.github/workflows/release-github.yml +++ b/.github/workflows/release-github.yml @@ -12,14 +12,14 @@ env: 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 + uses: ruby/setup-ruby@v1.176.0 with: ruby-version: 2.7 bundler-cache: true @@ -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..84e47e4b 100644 --- a/.github/workflows/test_0.yml +++ b/.github/workflows/test_0.yml @@ -13,14 +13,14 @@ env: 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 + uses: ruby/setup-ruby@v1.176.0.176.0 with: ruby-version: 2.7 bundler-cache: true @@ -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..0a3284c7 100644 --- a/.github/workflows/test_1.yml +++ b/.github/workflows/test_1.yml @@ -13,14 +13,14 @@ env: 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 + uses: ruby/setup-ruby@v1.176.0 with: ruby-version: 2.7 bundler-cache: true @@ -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..67d9d814 100644 --- a/.github/workflows/test_2.yml +++ b/.github/workflows/test_2.yml @@ -13,14 +13,14 @@ env: 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 + uses: ruby/setup-ruby@v1.176.0 with: ruby-version: 2.7 bundler-cache: true @@ -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" From f875bc617242917dee53a7130e298e4700d9dc67 Mon Sep 17 00:00:00 2001 From: Vitalii Pavlenko Date: Wed, 22 May 2024 16:35:37 +0200 Subject: [PATCH 02/10] test --- .github/workflows/test_0.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_0.yml b/.github/workflows/test_0.yml index 84e47e4b..8c0c72d3 100644 --- a/.github/workflows/test_0.yml +++ b/.github/workflows/test_0.yml @@ -20,7 +20,7 @@ jobs: uses: actions/checkout@v4 - name: Ruby & Bundle setup - uses: ruby/setup-ruby@v1.176.0.176.0 + uses: ruby/setup-ruby@v1.176.0 with: ruby-version: 2.7 bundler-cache: true From d9c91f4d0a1a4d37834293bc15dc871c4881055d Mon Sep 17 00:00:00 2001 From: Vitalii Pavlenko Date: Fri, 24 May 2024 10:39:20 +0200 Subject: [PATCH 03/10] test --- .github/workflows/release-cocoapods.yml | 2 +- .github/workflows/release-github.yml | 2 +- .github/workflows/test_0.yml | 2 +- .github/workflows/test_1.yml | 2 +- .github/workflows/test_2.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-cocoapods.yml b/.github/workflows/release-cocoapods.yml index 80faa3a6..f9b4cbb5 100644 --- a/.github/workflows/release-cocoapods.yml +++ b/.github/workflows/release-cocoapods.yml @@ -18,7 +18,7 @@ jobs: - name: Ruby & Bundle setup uses: ruby/setup-ruby@v1.176.0 with: - ruby-version: 2.7 + ruby-version: 3.2 bundler-cache: true - name: CocoaPods Release diff --git a/.github/workflows/release-github.yml b/.github/workflows/release-github.yml index 421834dd..98138bf7 100644 --- a/.github/workflows/release-github.yml +++ b/.github/workflows/release-github.yml @@ -21,7 +21,7 @@ jobs: - name: Ruby & Bundle setup uses: ruby/setup-ruby@v1.176.0 with: - ruby-version: 2.7 + ruby-version: 3.2 bundler-cache: true - name: Cocoapods cache diff --git a/.github/workflows/test_0.yml b/.github/workflows/test_0.yml index 8c0c72d3..98c34679 100644 --- a/.github/workflows/test_0.yml +++ b/.github/workflows/test_0.yml @@ -22,7 +22,7 @@ jobs: - name: Ruby & Bundle setup uses: ruby/setup-ruby@v1.176.0 with: - ruby-version: 2.7 + ruby-version: 3.2 bundler-cache: true - name: Cocoapods cache diff --git a/.github/workflows/test_1.yml b/.github/workflows/test_1.yml index 0a3284c7..b89edffa 100644 --- a/.github/workflows/test_1.yml +++ b/.github/workflows/test_1.yml @@ -22,7 +22,7 @@ jobs: - name: Ruby & Bundle setup uses: ruby/setup-ruby@v1.176.0 with: - ruby-version: 2.7 + ruby-version: 3.2 bundler-cache: true - name: Cocoapods cache diff --git a/.github/workflows/test_2.yml b/.github/workflows/test_2.yml index 67d9d814..a8ec6066 100644 --- a/.github/workflows/test_2.yml +++ b/.github/workflows/test_2.yml @@ -22,7 +22,7 @@ jobs: - name: Ruby & Bundle setup uses: ruby/setup-ruby@v1.176.0 with: - ruby-version: 2.7 + ruby-version: 3.2 bundler-cache: true - name: Cocoapods cache From c74ccbe7eb1e3ed85387484df9f38e08f432af86 Mon Sep 17 00:00:00 2001 From: Vitalii Pavlenko Date: Mon, 27 May 2024 10:45:28 +0200 Subject: [PATCH 04/10] test --- .github/workflows/release-cocoapods.yml | 4 +- .github/workflows/release-github.yml | 4 +- .github/workflows/test_0.yml | 4 +- .github/workflows/test_1.yml | 4 +- .github/workflows/test_2.yml | 4 +- Gemfile.lock | 54 +++++++++++++++++-------- 6 files changed, 47 insertions(+), 27 deletions(-) diff --git a/.github/workflows/release-cocoapods.yml b/.github/workflows/release-cocoapods.yml index f9b4cbb5..6d0987d8 100644 --- a/.github/workflows/release-cocoapods.yml +++ b/.github/workflows/release-cocoapods.yml @@ -16,9 +16,9 @@ jobs: uses: actions/checkout@v4 - name: Ruby & Bundle setup - uses: ruby/setup-ruby@v1.176.0 + uses: ruby/setup-ruby@v1 with: - ruby-version: 3.2 + ruby-version: 3.3 bundler-cache: true - name: CocoaPods Release diff --git a/.github/workflows/release-github.yml b/.github/workflows/release-github.yml index 98138bf7..cdbd1653 100644 --- a/.github/workflows/release-github.yml +++ b/.github/workflows/release-github.yml @@ -19,9 +19,9 @@ jobs: uses: actions/checkout@v4 - name: Ruby & Bundle setup - uses: ruby/setup-ruby@v1.176.0 + uses: ruby/setup-ruby@v1 with: - ruby-version: 3.2 + ruby-version: 3.3 bundler-cache: true - name: Cocoapods cache diff --git a/.github/workflows/test_0.yml b/.github/workflows/test_0.yml index 98c34679..365c3673 100644 --- a/.github/workflows/test_0.yml +++ b/.github/workflows/test_0.yml @@ -20,9 +20,9 @@ jobs: uses: actions/checkout@v4 - name: Ruby & Bundle setup - uses: ruby/setup-ruby@v1.176.0 + uses: ruby/setup-ruby@v1 with: - ruby-version: 3.2 + ruby-version: 3.3 bundler-cache: true - name: Cocoapods cache diff --git a/.github/workflows/test_1.yml b/.github/workflows/test_1.yml index b89edffa..26759651 100644 --- a/.github/workflows/test_1.yml +++ b/.github/workflows/test_1.yml @@ -20,9 +20,9 @@ jobs: uses: actions/checkout@v4 - name: Ruby & Bundle setup - uses: ruby/setup-ruby@v1.176.0 + uses: ruby/setup-ruby@v1 with: - ruby-version: 3.2 + ruby-version: 3.3 bundler-cache: true - name: Cocoapods cache diff --git a/.github/workflows/test_2.yml b/.github/workflows/test_2.yml index a8ec6066..d5749933 100644 --- a/.github/workflows/test_2.yml +++ b/.github/workflows/test_2.yml @@ -20,9 +20,9 @@ jobs: uses: actions/checkout@v4 - name: Ruby & Bundle setup - uses: ruby/setup-ruby@v1.176.0 + uses: ruby/setup-ruby@v1 with: - ruby-version: 3.2 + ruby-version: 3.3 bundler-cache: true - name: Cocoapods cache diff --git a/Gemfile.lock b/Gemfile.lock index d09ce280..27553192 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,7 +5,7 @@ GEM base64 nkf rexml - activesupport (7.1.3.2) + activesupport (7.1.3.3) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -23,24 +23,24 @@ GEM artifactory (3.0.17) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.921.0) - aws-sdk-core (3.193.0) + aws-partitions (1.934.0) + aws-sdk-core (3.196.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.80.0) + aws-sdk-kms (1.82.0) aws-sdk-core (~> 3, >= 3.193.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.148.0) - aws-sdk-core (~> 3, >= 3.193.0) + aws-sdk-s3 (1.151.0) + aws-sdk-core (~> 3, >= 3.194.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) base64 (0.2.0) - bigdecimal (3.1.7) + bigdecimal (3.1.8) claide (1.1.0) cocoapods (1.15.2) addressable (~> 2.8) @@ -81,7 +81,7 @@ GEM cocoapods-try (1.2.0) colored (1.2) colored2 (3.1.2) - colorize (0.8.1) + colorize (1.1.0) commander (4.6.0) highline (~> 2.0.0) concurrent-ruby (1.2.3) @@ -218,21 +218,21 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.14.4) + i18n (1.14.5) concurrent-ruby (~> 1.0) iostrust (1.0.0) commander (~> 4.3) sqlite3 jmespath (1.6.2) - json (2.6.3) + json (2.7.2) jwt (2.8.1) base64 mini_magick (4.12.0) mini_mime (1.1.5) - minitest (5.22.3) + minitest (5.23.1) molinillo (0.8.0) multi_json (1.15.0) - multipart-post (2.4.0) + multipart-post (2.4.1) mutex_m (0.2.0) nanaimo (0.3.0) nap (1.1.0) @@ -241,7 +241,7 @@ GEM nkf (0.2.0) optparse (0.5.0) os (1.1.4) - plist (3.7.0) + plist (3.7.1) public_suffix (4.0.7) rake (13.2.1) representable (3.2.0) @@ -249,7 +249,8 @@ GEM trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.2.6) + rexml (3.2.8) + strscan (>= 3.0.9) rouge (2.0.7) ruby-macho (2.5.1) ruby2_keywords (0.0.5) @@ -263,7 +264,17 @@ GEM simctl (1.6.10) CFPropertyList naturally - sqlite3 (1.4.2) + sqlite3 (2.0.2-aarch64-linux-gnu) + sqlite3 (2.0.2-aarch64-linux-musl) + sqlite3 (2.0.2-arm-linux-gnu) + sqlite3 (2.0.2-arm-linux-musl) + sqlite3 (2.0.2-arm64-darwin) + sqlite3 (2.0.2-x86-linux-gnu) + sqlite3 (2.0.2-x86-linux-musl) + sqlite3 (2.0.2-x86_64-darwin) + sqlite3 (2.0.2-x86_64-linux-gnu) + sqlite3 (2.0.2-x86_64-linux-musl) + strscan (3.1.0) terminal-notifier (2.0.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) @@ -293,7 +304,16 @@ GEM xctest_list (1.2.1) PLATFORMS - ruby + aarch64-linux-gnu + aarch64-linux-musl + arm-linux-gnu + arm-linux-musl + arm64-darwin + x86-linux-gnu + x86-linux-musl + x86_64-darwin + x86_64-linux-gnu + x86_64-linux-musl DEPENDENCIES cocoapods (= 1.15.2) @@ -304,4 +324,4 @@ DEPENDENCIES xcodeproj (= 1.23.0) BUNDLED WITH - 2.3.11 + 2.5.10 From 1f2b23dbd5089efd792487a1c6622feed74b4b67 Mon Sep 17 00:00:00 2001 From: Vitalii Pavlenko Date: Mon, 27 May 2024 11:18:17 +0200 Subject: [PATCH 05/10] test --- .github/workflows/release-cocoapods.yml | 2 +- .github/workflows/release-github.yml | 2 +- .github/workflows/test_0.yml | 2 +- .github/workflows/test_1.yml | 2 +- .github/workflows/test_2.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-cocoapods.yml b/.github/workflows/release-cocoapods.yml index 6d0987d8..ceabe584 100644 --- a/.github/workflows/release-cocoapods.yml +++ b/.github/workflows/release-cocoapods.yml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@v4 - name: Ruby & Bundle setup - uses: ruby/setup-ruby@v1 + uses: ruby/setup-ruby@22fdc77bf4148f810455b226c90fb81b5cbc00a7 # v1.171.0 with: ruby-version: 3.3 bundler-cache: true diff --git a/.github/workflows/release-github.yml b/.github/workflows/release-github.yml index cdbd1653..a8dcd27d 100644 --- a/.github/workflows/release-github.yml +++ b/.github/workflows/release-github.yml @@ -19,7 +19,7 @@ jobs: uses: actions/checkout@v4 - name: Ruby & Bundle setup - uses: ruby/setup-ruby@v1 + uses: ruby/setup-ruby@22fdc77bf4148f810455b226c90fb81b5cbc00a7 # v1.171.0 with: ruby-version: 3.3 bundler-cache: true diff --git a/.github/workflows/test_0.yml b/.github/workflows/test_0.yml index 365c3673..e9474e15 100644 --- a/.github/workflows/test_0.yml +++ b/.github/workflows/test_0.yml @@ -20,7 +20,7 @@ jobs: uses: actions/checkout@v4 - name: Ruby & Bundle setup - uses: ruby/setup-ruby@v1 + uses: ruby/setup-ruby@22fdc77bf4148f810455b226c90fb81b5cbc00a7 # v1.171.0 with: ruby-version: 3.3 bundler-cache: true diff --git a/.github/workflows/test_1.yml b/.github/workflows/test_1.yml index 26759651..253010cf 100644 --- a/.github/workflows/test_1.yml +++ b/.github/workflows/test_1.yml @@ -20,7 +20,7 @@ jobs: uses: actions/checkout@v4 - name: Ruby & Bundle setup - uses: ruby/setup-ruby@v1 + uses: ruby/setup-ruby@22fdc77bf4148f810455b226c90fb81b5cbc00a7 # v1.171.0 with: ruby-version: 3.3 bundler-cache: true diff --git a/.github/workflows/test_2.yml b/.github/workflows/test_2.yml index d5749933..5025d55d 100644 --- a/.github/workflows/test_2.yml +++ b/.github/workflows/test_2.yml @@ -20,7 +20,7 @@ jobs: uses: actions/checkout@v4 - name: Ruby & Bundle setup - uses: ruby/setup-ruby@v1 + uses: ruby/setup-ruby@22fdc77bf4148f810455b226c90fb81b5cbc00a7 # v1.171.0 with: ruby-version: 3.3 bundler-cache: true From 7cff97341cbfe21de3319a2ed279b13c01f45c65 Mon Sep 17 00:00:00 2001 From: Vitalii Pavlenko Date: Mon, 27 May 2024 11:30:42 +0200 Subject: [PATCH 06/10] test --- .github/workflows/release-cocoapods.yml | 2 +- .github/workflows/release-github.yml | 2 +- .github/workflows/test_0.yml | 2 +- .github/workflows/test_1.yml | 2 +- .github/workflows/test_2.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-cocoapods.yml b/.github/workflows/release-cocoapods.yml index ceabe584..e7ff7db4 100644 --- a/.github/workflows/release-cocoapods.yml +++ b/.github/workflows/release-cocoapods.yml @@ -5,7 +5,7 @@ on: types: [ published ] env: - DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer jobs: release-cocoapods: diff --git a/.github/workflows/release-github.yml b/.github/workflows/release-github.yml index a8dcd27d..730e69b7 100644 --- a/.github/workflows/release-github.yml +++ b/.github/workflows/release-github.yml @@ -7,7 +7,7 @@ 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: diff --git a/.github/workflows/test_0.yml b/.github/workflows/test_0.yml index e9474e15..e5c5ad22 100644 --- a/.github/workflows/test_0.yml +++ b/.github/workflows/test_0.yml @@ -9,7 +9,7 @@ on: workflow_dispatch: env: - DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer jobs: test: diff --git a/.github/workflows/test_1.yml b/.github/workflows/test_1.yml index 253010cf..59d1b0a0 100644 --- a/.github/workflows/test_1.yml +++ b/.github/workflows/test_1.yml @@ -9,7 +9,7 @@ on: workflow_dispatch: env: - DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer jobs: test: diff --git a/.github/workflows/test_2.yml b/.github/workflows/test_2.yml index 5025d55d..9ea9ff05 100644 --- a/.github/workflows/test_2.yml +++ b/.github/workflows/test_2.yml @@ -9,7 +9,7 @@ on: workflow_dispatch: env: - DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer jobs: test: From 86f466b7dc80ae8891db1b4d688ff51bce1a9c0d Mon Sep 17 00:00:00 2001 From: Vitalii Pavlenko Date: Mon, 27 May 2024 11:36:14 +0200 Subject: [PATCH 07/10] test --- .github/workflows/release-cocoapods.yml | 2 +- .github/workflows/release-github.yml | 2 +- .github/workflows/test_0.yml | 2 +- .github/workflows/test_1.yml | 2 +- .github/workflows/test_2.yml | 2 +- Gemfile.lock | 54 ++++++++----------------- 6 files changed, 22 insertions(+), 42 deletions(-) diff --git a/.github/workflows/release-cocoapods.yml b/.github/workflows/release-cocoapods.yml index e7ff7db4..ca12e209 100644 --- a/.github/workflows/release-cocoapods.yml +++ b/.github/workflows/release-cocoapods.yml @@ -18,7 +18,7 @@ jobs: - name: Ruby & Bundle setup uses: ruby/setup-ruby@22fdc77bf4148f810455b226c90fb81b5cbc00a7 # v1.171.0 with: - ruby-version: 3.3 + ruby-version: 2.7 bundler-cache: true - name: CocoaPods Release diff --git a/.github/workflows/release-github.yml b/.github/workflows/release-github.yml index 730e69b7..8832db23 100644 --- a/.github/workflows/release-github.yml +++ b/.github/workflows/release-github.yml @@ -21,7 +21,7 @@ jobs: - name: Ruby & Bundle setup uses: ruby/setup-ruby@22fdc77bf4148f810455b226c90fb81b5cbc00a7 # v1.171.0 with: - ruby-version: 3.3 + ruby-version: 2.7 bundler-cache: true - name: Cocoapods cache diff --git a/.github/workflows/test_0.yml b/.github/workflows/test_0.yml index e5c5ad22..0c87abdf 100644 --- a/.github/workflows/test_0.yml +++ b/.github/workflows/test_0.yml @@ -22,7 +22,7 @@ jobs: - name: Ruby & Bundle setup uses: ruby/setup-ruby@22fdc77bf4148f810455b226c90fb81b5cbc00a7 # v1.171.0 with: - ruby-version: 3.3 + ruby-version: 2.7 bundler-cache: true - name: Cocoapods cache diff --git a/.github/workflows/test_1.yml b/.github/workflows/test_1.yml index 59d1b0a0..4f18fa89 100644 --- a/.github/workflows/test_1.yml +++ b/.github/workflows/test_1.yml @@ -22,7 +22,7 @@ jobs: - name: Ruby & Bundle setup uses: ruby/setup-ruby@22fdc77bf4148f810455b226c90fb81b5cbc00a7 # v1.171.0 with: - ruby-version: 3.3 + ruby-version: 2.7 bundler-cache: true - name: Cocoapods cache diff --git a/.github/workflows/test_2.yml b/.github/workflows/test_2.yml index 9ea9ff05..429eb8d7 100644 --- a/.github/workflows/test_2.yml +++ b/.github/workflows/test_2.yml @@ -22,7 +22,7 @@ jobs: - name: Ruby & Bundle setup uses: ruby/setup-ruby@22fdc77bf4148f810455b226c90fb81b5cbc00a7 # v1.171.0 with: - ruby-version: 3.3 + ruby-version: 2.7 bundler-cache: true - name: Cocoapods cache diff --git a/Gemfile.lock b/Gemfile.lock index 27553192..d09ce280 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,7 +5,7 @@ GEM base64 nkf rexml - activesupport (7.1.3.3) + activesupport (7.1.3.2) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -23,24 +23,24 @@ GEM artifactory (3.0.17) atomos (0.1.3) aws-eventstream (1.3.0) - aws-partitions (1.934.0) - aws-sdk-core (3.196.1) + aws-partitions (1.921.0) + aws-sdk-core (3.193.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.82.0) + aws-sdk-kms (1.80.0) aws-sdk-core (~> 3, >= 3.193.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.151.0) - aws-sdk-core (~> 3, >= 3.194.0) + aws-sdk-s3 (1.148.0) + aws-sdk-core (~> 3, >= 3.193.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) base64 (0.2.0) - bigdecimal (3.1.8) + bigdecimal (3.1.7) claide (1.1.0) cocoapods (1.15.2) addressable (~> 2.8) @@ -81,7 +81,7 @@ GEM cocoapods-try (1.2.0) colored (1.2) colored2 (3.1.2) - colorize (1.1.0) + colorize (0.8.1) commander (4.6.0) highline (~> 2.0.0) concurrent-ruby (1.2.3) @@ -218,21 +218,21 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.14.5) + i18n (1.14.4) concurrent-ruby (~> 1.0) iostrust (1.0.0) commander (~> 4.3) sqlite3 jmespath (1.6.2) - json (2.7.2) + json (2.6.3) jwt (2.8.1) base64 mini_magick (4.12.0) mini_mime (1.1.5) - minitest (5.23.1) + minitest (5.22.3) molinillo (0.8.0) multi_json (1.15.0) - multipart-post (2.4.1) + multipart-post (2.4.0) mutex_m (0.2.0) nanaimo (0.3.0) nap (1.1.0) @@ -241,7 +241,7 @@ GEM nkf (0.2.0) optparse (0.5.0) os (1.1.4) - plist (3.7.1) + plist (3.7.0) public_suffix (4.0.7) rake (13.2.1) representable (3.2.0) @@ -249,8 +249,7 @@ GEM trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.2.8) - strscan (>= 3.0.9) + rexml (3.2.6) rouge (2.0.7) ruby-macho (2.5.1) ruby2_keywords (0.0.5) @@ -264,17 +263,7 @@ GEM simctl (1.6.10) CFPropertyList naturally - sqlite3 (2.0.2-aarch64-linux-gnu) - sqlite3 (2.0.2-aarch64-linux-musl) - sqlite3 (2.0.2-arm-linux-gnu) - sqlite3 (2.0.2-arm-linux-musl) - sqlite3 (2.0.2-arm64-darwin) - sqlite3 (2.0.2-x86-linux-gnu) - sqlite3 (2.0.2-x86-linux-musl) - sqlite3 (2.0.2-x86_64-darwin) - sqlite3 (2.0.2-x86_64-linux-gnu) - sqlite3 (2.0.2-x86_64-linux-musl) - strscan (3.1.0) + sqlite3 (1.4.2) terminal-notifier (2.0.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) @@ -304,16 +293,7 @@ GEM xctest_list (1.2.1) PLATFORMS - aarch64-linux-gnu - aarch64-linux-musl - arm-linux-gnu - arm-linux-musl - arm64-darwin - x86-linux-gnu - x86-linux-musl - x86_64-darwin - x86_64-linux-gnu - x86_64-linux-musl + ruby DEPENDENCIES cocoapods (= 1.15.2) @@ -324,4 +304,4 @@ DEPENDENCIES xcodeproj (= 1.23.0) BUNDLED WITH - 2.5.10 + 2.3.11 From 90ccacb17be8b2f40433875869e1703e1bcf83d9 Mon Sep 17 00:00:00 2001 From: Vitalii Pavlenko Date: Mon, 27 May 2024 12:44:37 +0200 Subject: [PATCH 08/10] test --- .github/workflows/release-cocoapods.yml | 4 ++-- .github/workflows/release-github.yml | 4 ++-- .github/workflows/test_0.yml | 4 ++-- .github/workflows/test_1.yml | 4 ++-- .github/workflows/test_2.yml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release-cocoapods.yml b/.github/workflows/release-cocoapods.yml index ca12e209..4b6bf66b 100644 --- a/.github/workflows/release-cocoapods.yml +++ b/.github/workflows/release-cocoapods.yml @@ -9,14 +9,14 @@ env: jobs: release-cocoapods: - runs-on: macos-latest + runs-on: macos-13 steps: - name: Checkout uses: actions/checkout@v4 - name: Ruby & Bundle setup - uses: ruby/setup-ruby@22fdc77bf4148f810455b226c90fb81b5cbc00a7 # v1.171.0 + uses: ruby/setup-ruby@v1 with: ruby-version: 2.7 bundler-cache: true diff --git a/.github/workflows/release-github.yml b/.github/workflows/release-github.yml index 8832db23..738102be 100644 --- a/.github/workflows/release-github.yml +++ b/.github/workflows/release-github.yml @@ -12,14 +12,14 @@ env: jobs: test-and-release: # Clone of main test workflow - runs-on: macos-latest + runs-on: macos-13 steps: - name: Checkout uses: actions/checkout@v4 - name: Ruby & Bundle setup - uses: ruby/setup-ruby@22fdc77bf4148f810455b226c90fb81b5cbc00a7 # v1.171.0 + uses: ruby/setup-ruby@v1 with: ruby-version: 2.7 bundler-cache: true diff --git a/.github/workflows/test_0.yml b/.github/workflows/test_0.yml index 0c87abdf..c3d48cd4 100644 --- a/.github/workflows/test_0.yml +++ b/.github/workflows/test_0.yml @@ -13,14 +13,14 @@ env: jobs: test: - runs-on: macos-latest + runs-on: macos-13 steps: - name: Checkout uses: actions/checkout@v4 - name: Ruby & Bundle setup - uses: ruby/setup-ruby@22fdc77bf4148f810455b226c90fb81b5cbc00a7 # v1.171.0 + uses: ruby/setup-ruby@v1 with: ruby-version: 2.7 bundler-cache: true diff --git a/.github/workflows/test_1.yml b/.github/workflows/test_1.yml index 4f18fa89..96e55cb2 100644 --- a/.github/workflows/test_1.yml +++ b/.github/workflows/test_1.yml @@ -13,14 +13,14 @@ env: jobs: test: - runs-on: macos-latest + runs-on: macos-13 steps: - name: Checkout uses: actions/checkout@v4 - name: Ruby & Bundle setup - uses: ruby/setup-ruby@22fdc77bf4148f810455b226c90fb81b5cbc00a7 # v1.171.0 + uses: ruby/setup-ruby@v1 with: ruby-version: 2.7 bundler-cache: true diff --git a/.github/workflows/test_2.yml b/.github/workflows/test_2.yml index 429eb8d7..8ef59581 100644 --- a/.github/workflows/test_2.yml +++ b/.github/workflows/test_2.yml @@ -13,14 +13,14 @@ env: jobs: test: - runs-on: macos-latest + runs-on: macos-13 steps: - name: Checkout uses: actions/checkout@v4 - name: Ruby & Bundle setup - uses: ruby/setup-ruby@22fdc77bf4148f810455b226c90fb81b5cbc00a7 # v1.171.0 + uses: ruby/setup-ruby@v1 with: ruby-version: 2.7 bundler-cache: true From 517d38f0bbac928d46925660d00f74b9a84fee0e Mon Sep 17 00:00:00 2001 From: Vitalii Pavlenko Date: Mon, 27 May 2024 13:48:18 +0200 Subject: [PATCH 09/10] test --- .github/workflows/release-cocoapods.yml | 2 +- .github/workflows/release-github.yml | 2 +- .github/workflows/test_0.yml | 2 +- .github/workflows/test_1.yml | 2 +- .github/workflows/test_2.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-cocoapods.yml b/.github/workflows/release-cocoapods.yml index 4b6bf66b..8a960c58 100644 --- a/.github/workflows/release-cocoapods.yml +++ b/.github/workflows/release-cocoapods.yml @@ -9,7 +9,7 @@ env: jobs: release-cocoapods: - runs-on: macos-13 + runs-on: macos-latest steps: - name: Checkout diff --git a/.github/workflows/release-github.yml b/.github/workflows/release-github.yml index 738102be..61ec81b5 100644 --- 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-13 + runs-on: macos-latest steps: - name: Checkout diff --git a/.github/workflows/test_0.yml b/.github/workflows/test_0.yml index c3d48cd4..0f79a11c 100644 --- a/.github/workflows/test_0.yml +++ b/.github/workflows/test_0.yml @@ -13,7 +13,7 @@ env: jobs: test: - runs-on: macos-13 + runs-on: macos-latest steps: - name: Checkout diff --git a/.github/workflows/test_1.yml b/.github/workflows/test_1.yml index 96e55cb2..14f6cc72 100644 --- a/.github/workflows/test_1.yml +++ b/.github/workflows/test_1.yml @@ -13,7 +13,7 @@ env: jobs: test: - runs-on: macos-13 + runs-on: macos-latest steps: - name: Checkout diff --git a/.github/workflows/test_2.yml b/.github/workflows/test_2.yml index 8ef59581..94e2ee0b 100644 --- a/.github/workflows/test_2.yml +++ b/.github/workflows/test_2.yml @@ -13,7 +13,7 @@ env: jobs: test: - runs-on: macos-13 + runs-on: macos-latest steps: - name: Checkout From dd0d2051457e11fe53b5239f6e05a3bf3f0d2a12 Mon Sep 17 00:00:00 2001 From: Vitalii Pavlenko Date: Wed, 29 May 2024 20:16:16 +0200 Subject: [PATCH 10/10] test --- .../Tests/IntegrationTests/CRInterstitialDelegateTests.m | 5 +---- CriteoPublisherSdk/Tests/UnitTests/Native/CRMediaViewTests.m | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) 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 {