From 5a1e1d72e133368370623967d14c1b9592f3cc7d Mon Sep 17 00:00:00 2001 From: Cornelius Horstmann Date: Sun, 23 Mar 2025 17:29:15 +0100 Subject: [PATCH 1/4] Updated ruby-version and gems --- .ruby-version | 2 +- Gemfile.lock | 107 ++++++++++++++++++++++++++++++++------------------ 2 files changed, 69 insertions(+), 40 deletions(-) diff --git a/.ruby-version b/.ruby-version index f398a206..a423d421 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.0 \ No newline at end of file +3.4.2 \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 6635da7a..68400c38 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -5,16 +5,18 @@ GEM base64 nkf rexml - activesupport (7.1.4) + activesupport (7.2.2.1) base64 + benchmark (>= 0.3) bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) algoliasearch (1.27.5) @@ -22,16 +24,17 @@ GEM json (>= 1.5.1) atomos (0.1.3) base64 (0.2.0) - bigdecimal (3.1.8) + benchmark (0.4.0) + bigdecimal (3.1.9) claide (1.1.0) claide-plugins (0.9.2) cork nap open4 (~> 1.3) - cocoapods (1.15.2) + cocoapods (1.16.2) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.15.2) + cocoapods-core (= 1.16.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 2.1, < 3.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -45,8 +48,8 @@ GEM molinillo (~> 0.8.0) nap (~> 1.0) ruby-macho (>= 2.3.0, < 3.0) - xcodeproj (>= 1.23.0, < 2.0) - cocoapods-core (1.15.2) + xcodeproj (>= 1.27.0, < 2.0) + cocoapods-core (1.16.2) activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) @@ -66,11 +69,12 @@ GEM netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.3.4) - connection_pool (2.4.1) + concurrent-ruby (1.3.5) + connection_pool (2.5.0) cork (0.3.0) colored2 (~> 3.1) - danger (9.5.0) + danger (9.5.1) + base64 (~> 0.2) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) @@ -81,75 +85,100 @@ GEM kramdown (~> 2.3) kramdown-parser-gfm (~> 1.0) octokit (>= 4.0) + pstore (~> 0.1) terminal-table (>= 1, < 4) drb (2.2.1) escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) - faraday (2.11.0) - faraday-net_http (>= 2.0, < 3.4) + faraday (2.12.2) + faraday-net_http (>= 2.0, < 3.5) + json logger faraday-http-cache (2.5.1) faraday (>= 0.8) - faraday-net_http (3.3.0) - net-http - ffi (1.17.0) + faraday-net_http (3.4.0) + net-http (>= 0.5.0) + ffi (1.17.1) + ffi (1.17.1-aarch64-linux-gnu) + ffi (1.17.1-aarch64-linux-musl) + ffi (1.17.1-arm-linux-gnu) + ffi (1.17.1-arm-linux-musl) + ffi (1.17.1-arm64-darwin) + ffi (1.17.1-x86-linux-gnu) + ffi (1.17.1-x86-linux-musl) + ffi (1.17.1-x86_64-darwin) + ffi (1.17.1-x86_64-linux-gnu) + ffi (1.17.1-x86_64-linux-musl) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) git (1.19.1) addressable (~> 2.8) rchardet (~> 1.8) - httpclient (2.8.3) - i18n (1.14.5) + httpclient (2.9.0) + mutex_m + i18n (1.14.7) concurrent-ruby (~> 1.0) - json (2.7.2) - kramdown (2.4.0) - rexml + json (2.10.2) + kramdown (2.5.1) + rexml (>= 3.3.9) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - logger (1.6.1) - minitest (5.25.1) + logger (1.6.6) + minitest (5.25.5) molinillo (0.8.0) - mutex_m (0.2.0) - nanaimo (0.3.0) + mutex_m (0.3.0) + nanaimo (0.4.0) nap (1.1.0) - net-http (0.4.1) + net-http (0.6.0) uri netrc (0.11.0) nkf (0.2.0) - octokit (9.1.0) + octokit (9.2.0) faraday (>= 1, < 3) sawyer (~> 0.9) open4 (1.3.4) + pstore (0.2.0) public_suffix (4.0.7) - rchardet (1.8.0) - rexml (3.3.7) - rouge (2.0.7) + rchardet (1.9.0) + rexml (3.4.1) + rouge (3.28.0) ruby-macho (2.5.1) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) + securerandom (0.4.1) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) typhoeus (1.4.1) ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.5.0) - uri (0.13.1) - xcodeproj (1.25.0) + unicode-display_width (2.6.0) + uri (1.0.3) + xcodeproj (1.27.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.3.0) - rexml (>= 3.3.2, < 4.0) - xcpretty (0.3.0) - rouge (~> 2.0.7) + nanaimo (~> 0.4.0) + rexml (>= 3.3.6, < 4.0) + xcpretty (0.4.0) + rouge (~> 3.28.0) PLATFORMS + aarch64-linux-gnu + aarch64-linux-musl + arm-linux-gnu + arm-linux-musl + arm64-darwin ruby + x86-linux-gnu + x86-linux-musl + x86_64-darwin + x86_64-linux-gnu + x86_64-linux-musl DEPENDENCIES cocoapods @@ -157,4 +186,4 @@ DEPENDENCIES xcpretty BUNDLED WITH - 2.2.17 + 2.6.6 From 09b3014ec08985411f7d690655d20527a41559cf Mon Sep 17 00:00:00 2001 From: Cornelius Horstmann Date: Sun, 23 Mar 2025 17:33:16 +0100 Subject: [PATCH 2/4] Updated ruby version in github workflows as well --- .github/workflows/danger.yml | 2 +- .github/workflows/test.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index cbd245f8..24ab17fd 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 with: - ruby-version: '3.0' + ruby-version: '3.4.2' bundler-cache: true - uses: MeilCli/danger-action@v5 with: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d3ef383d..49859fdd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 with: - ruby-version: '3.0' + ruby-version: '3.4.2' bundler-cache: true - name: pod install run: pod install || pod install --repo-update @@ -57,7 +57,7 @@ jobs: - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 with: - ruby-version: '3.0' + ruby-version: '3.4.2' bundler-cache: true - name: pod install run: pod install || pod install --repo-update From 7cd0d182ccb7d38af29659bf89f3738e336aeebe Mon Sep 17 00:00:00 2001 From: Cornelius Horstmann Date: Sun, 23 Mar 2025 17:40:24 +0100 Subject: [PATCH 3/4] Updated Nimble --- MatomoTracker.xcodeproj/project.pbxproj | 10 ++++++++++ Podfile | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/MatomoTracker.xcodeproj/project.pbxproj b/MatomoTracker.xcodeproj/project.pbxproj index 329efb83..d4ab7ef4 100644 --- a/MatomoTracker.xcodeproj/project.pbxproj +++ b/MatomoTracker.xcodeproj/project.pbxproj @@ -364,11 +364,21 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-MatomoTrackerTests/Pods-MatomoTrackerTests-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/CwlCatchException/CwlCatchException.framework", + "${BUILT_PRODUCTS_DIR}/CwlCatchExceptionSupport/CwlCatchExceptionSupport.framework", + "${BUILT_PRODUCTS_DIR}/CwlMachBadInstructionHandler/CwlMachBadInstructionHandler.framework", + "${BUILT_PRODUCTS_DIR}/CwlPosixPreconditionTesting/CwlPosixPreconditionTesting.framework", + "${BUILT_PRODUCTS_DIR}/CwlPreconditionTesting/CwlPreconditionTesting.framework", "${BUILT_PRODUCTS_DIR}/Nimble/Nimble.framework", "${BUILT_PRODUCTS_DIR}/Quick/Quick.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CwlCatchException.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CwlCatchExceptionSupport.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CwlMachBadInstructionHandler.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CwlPosixPreconditionTesting.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CwlPreconditionTesting.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Nimble.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Quick.framework", ); diff --git a/Podfile b/Podfile index 566a9e81..7fceeb20 100644 --- a/Podfile +++ b/Podfile @@ -35,7 +35,7 @@ target 'MatomoTrackerTests' do inherit! :search_paths pod 'Quick', '~> 7.0' - pod 'Nimble', '~> 12.0' + pod 'Nimble', '~> 13.0' end # https://github.com/CocoaPods/CocoaPods/issues/11402 From b161806d430180bdecd2ddcd611f2fa8123237e0 Mon Sep 17 00:00:00 2001 From: Cornelius Horstmann Date: Sun, 23 Mar 2025 17:43:58 +0100 Subject: [PATCH 4/4] Updated Danger github action --- .github/workflows/danger.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index 24ab17fd..9261f406 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -15,7 +15,7 @@ jobs: with: ruby-version: '3.4.2' bundler-cache: true - - uses: MeilCli/danger-action@v5 + - uses: MeilCli/danger-action@v6 with: plugins_file: 'Gemfile' install_path: 'vendor/bundle'