From 9650e274285bd56b783e99743473b72ab8aae0b8 Mon Sep 17 00:00:00 2001 From: sankalpsingh Date: Fri, 29 May 2026 21:39:24 +0530 Subject: [PATCH 1/3] fix(ci): upgrade Xcode version to 16.2 for iOS build compatibility --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 01aece4..25fcab1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -156,7 +156,7 @@ jobs: runs-on: macos-latest env: - XCODE_VERSION: 16.1 + XCODE_VERSION: 16.2 TURBO_CACHE_DIR: .turbo/ios RCT_USE_RN_DEP: 1 RCT_USE_PREBUILT_RNCORE: 1 From 5ffb7445f82a5a7222791c48ac3cc7f51c40f4b0 Mon Sep 17 00:00:00 2001 From: sankalpsingh Date: Fri, 29 May 2026 22:06:14 +0530 Subject: [PATCH 2/3] fix(ci): upgrade CocoaPods to 1.16.2 to match Podfile.lock Relaxes the xcodeproj < 1.26.0 constraint that was blocking CocoaPods 1.16.x in bundler. Runs bundle update to pin CocoaPods 1.16.2 and xcodeproj 1.27.0 in Gemfile.lock, aligning CI's bundler-managed gem versions with the Podfile.lock generated locally by CocoaPods 1.16.1. Also adds --verbose to the build:ios script for better CI diagnostics. Co-Authored-By: Claude Sonnet 4.6 --- example/Gemfile | 2 +- example/Gemfile.lock | 20 ++++++++++---------- example/package.json | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/example/Gemfile b/example/Gemfile index 6a4c5f1..ba59293 100644 --- a/example/Gemfile +++ b/example/Gemfile @@ -6,7 +6,7 @@ ruby ">= 2.6.10" # Exclude problematic versions of cocoapods and activesupport that causes build failures. gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1' gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0' -gem 'xcodeproj', '< 1.26.0' +gem 'xcodeproj', '>= 1.26.0' gem 'concurrent-ruby', '< 1.3.4' # Ruby 3.4.0 has removed some libraries from the standard library. diff --git a/example/Gemfile.lock b/example/Gemfile.lock index 7b209c3..398d1f8 100644 --- a/example/Gemfile.lock +++ b/example/Gemfile.lock @@ -24,10 +24,10 @@ GEM benchmark (0.5.0) bigdecimal (4.1.2) claide (1.1.0) - 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) @@ -41,8 +41,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) @@ -77,12 +77,12 @@ GEM mutex_m i18n (1.14.8) concurrent-ruby (~> 1.0) - json (2.19.5) + json (2.19.7) logger (1.7.0) minitest (5.27.0) molinillo (0.8.0) mutex_m (0.3.0) - nanaimo (0.3.0) + nanaimo (0.4.0) nap (1.1.0) netrc (0.11.0) public_suffix (4.0.7) @@ -93,12 +93,12 @@ GEM ethon (>= 0.18.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - xcodeproj (1.25.1) + 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) + nanaimo (~> 0.4.0) rexml (>= 3.3.6, < 4.0) PLATFORMS @@ -112,10 +112,10 @@ DEPENDENCIES concurrent-ruby (< 1.3.4) logger mutex_m - xcodeproj (< 1.26.0) + xcodeproj (>= 1.26.0) RUBY VERSION ruby 3.2.0p0 BUNDLED WITH - 2.5.11 + 2.4.1 diff --git a/example/package.json b/example/package.json index 2c2af15..25a5836 100644 --- a/example/package.json +++ b/example/package.json @@ -7,7 +7,7 @@ "ios": "react-native run-ios", "start": "react-native start --client-logs", "build:android": "react-native build-android --extra-params \"--no-daemon --console=plain -PreactNativeArchitectures=arm64-v8a\"", - "build:ios": "react-native build-ios --mode Debug" + "build:ios": "react-native build-ios --mode Debug --verbose" }, "dependencies": { "@react-native-masked-view/masked-view": "^0.3.2", From d564dfd72af466d42fe26455fd9485952de9986b Mon Sep 17 00:00:00 2001 From: sankalpsingh Date: Fri, 29 May 2026 22:43:16 +0530 Subject: [PATCH 3/3] fix(ios): fix getRequestCount return type and remove setup-xcode step - Change getRequestCount from double to NSNumber * to match the codegen'd ObjC protocol declaration, eliminating the -Wmismatched-return-types warning - Remove the setup-xcode step: macos-latest (macos-15) defaults to Xcode 16.2 with iOS 18.2 platform fully installed; setup-xcode was resolving to a bundle where the platform was not linked, causing the storyboard build error Co-Authored-By: Claude Sonnet 4.6 --- .github/workflows/ci.yml | 6 ------ ios/NetworkTools.mm | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 25fcab1..c17a313 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -184,12 +184,6 @@ jobs: echo "turbo_cache_hit=1" >> $GITHUB_ENV fi - - name: Use appropriate Xcode version - if: env.turbo_cache_hit != 1 - uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0 - with: - xcode-version: ${{ env.XCODE_VERSION }} - - name: Install cocoapods if: env.turbo_cache_hit != 1 && steps.cocoapods-cache.outputs.cache-hit != 'true' run: | diff --git a/ios/NetworkTools.mm b/ios/NetworkTools.mm index a7df931..ef361da 100644 --- a/ios/NetworkTools.mm +++ b/ios/NetworkTools.mm @@ -59,8 +59,8 @@ - (void)clearAllRequests { [[NetworkToolsStorage shared] clearAll]; } -- (double)getRequestCount { - return (double)[[NetworkToolsStorage shared] count]; +- (NSNumber *)getRequestCount { + return @([[NetworkToolsStorage shared] count]); } // addListener / removeListeners are inherited from RCTEventEmitter and satisfy