From 869bf270b878bbeec408324f6fc163a6008ac067 Mon Sep 17 00:00:00 2001 From: Sun Date: Tue, 24 Mar 2026 11:50:57 +0800 Subject: [PATCH] Fix Xcode 26.4 benchmark build --- Podfile | 23 +++++++++++++++++++ .../AFNetworking/AFHTTPSessionManager.m | 1 - .../AFNetworkReachabilityManager.m | 8 +++---- benchmark.sh | 18 +++++++++++---- 4 files changed, 40 insertions(+), 10 deletions(-) diff --git a/Podfile b/Podfile index 1df4760cb..3703651c8 100644 --- a/Podfile +++ b/Podfile @@ -89,4 +89,27 @@ post_install do |pi| end end end + + afnetworking_reachability = pi.sandbox.root + 'AFNetworking/AFNetworking/AFNetworkReachabilityManager.m' + if File.exist?(afnetworking_reachability) + file_content = File.read(afnetworking_reachability) + patched_content = file_content + .gsub('#import ' + "\n", "#import \n#import \n") + .gsub("#import \n", '') + .gsub('struct sockaddr_in6 address;', 'struct sockaddr_storage address;') + .gsub('address.sin6_len = sizeof(address);', 'address.ss_len = sizeof(address);') + .gsub('address.sin6_family = AF_INET6;', 'address.ss_family = AF_INET6;') + if patched_content != file_content + File.write(afnetworking_reachability, patched_content) + end + end + + afnetworking_http = pi.sandbox.root + 'AFNetworking/AFNetworking/AFHTTPSessionManager.m' + if File.exist?(afnetworking_http) + file_content = File.read(afnetworking_http) + patched_content = file_content.gsub("#import \n", '') + if patched_content != file_content + File.write(afnetworking_http, patched_content) + end + end end diff --git a/Pods/AFNetworking/AFNetworking/AFHTTPSessionManager.m b/Pods/AFNetworking/AFNetworking/AFHTTPSessionManager.m index b4ab5915c..2e25641e9 100644 --- a/Pods/AFNetworking/AFNetworking/AFHTTPSessionManager.m +++ b/Pods/AFNetworking/AFNetworking/AFHTTPSessionManager.m @@ -29,7 +29,6 @@ #import #import -#import #import #import #import diff --git a/Pods/AFNetworking/AFNetworking/AFNetworkReachabilityManager.m b/Pods/AFNetworking/AFNetworking/AFNetworkReachabilityManager.m index 0322bf9b8..9481112ea 100644 --- a/Pods/AFNetworking/AFNetworking/AFNetworkReachabilityManager.m +++ b/Pods/AFNetworking/AFNetworking/AFNetworkReachabilityManager.m @@ -22,8 +22,8 @@ #import "AFNetworkReachabilityManager.h" #if !TARGET_OS_WATCH +#import #import -#import #import #import #import @@ -147,10 +147,10 @@ + (instancetype)managerForAddress:(const void *)address { + (instancetype)manager { #if (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000) || (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100) - struct sockaddr_in6 address; + struct sockaddr_storage address; bzero(&address, sizeof(address)); - address.sin6_len = sizeof(address); - address.sin6_family = AF_INET6; + address.ss_len = sizeof(address); + address.ss_family = AF_INET6; #else struct sockaddr_in address; bzero(&address, sizeof(address)); diff --git a/benchmark.sh b/benchmark.sh index 4e9c66a35..84d8418cb 100644 --- a/benchmark.sh +++ b/benchmark.sh @@ -7,18 +7,25 @@ echo "Preparing environment" START_TIME=$(date +"%T") -defaults write com.apple.dt.Xcode ShowBuildOperationDuration YES +if ! defaults write com.apple.dt.Xcode ShowBuildOperationDuration YES >/dev/null 2>&1; then + echo "Warning: failed to enable Xcode build duration output" +fi -if [ -n "$PATH_TO_PROJECT" ]; then +if [ -d "$PATH_TO_PROJECT" ]; then echo "Running XcodeBenchmark..." echo "Please do not use your Mac while XcodeBenchmark is in progress\n\n" - xcodebuild -workspace "$PATH_TO_PROJECT" \ + if ! xcodebuild -workspace "$PATH_TO_PROJECT" \ -scheme XcodeBenchmark \ -destination generic/platform=iOS \ -derivedDataPath "$PATH_TO_DERIVED" \ - build + build; then + echo "" + echo "❌ XcodeBenchmark build failed" + rm -rf "$PATH_TO_DERIVED" + exit 1 + fi echo "System Version:" "$(sw_vers -productVersion)" xcodebuild -version | grep "Xcode" @@ -54,9 +61,10 @@ if [ -n "$PATH_TO_PROJECT" ]; then echo "" echo "2️⃣ Share your results at https://github.com/devMEremenko/XcodeBenchmark" - rm -rfd "$PATH_TO_DERIVED" + rm -rf "$PATH_TO_DERIVED" else echo "XcodeBenchmark.xcworkspace was not found in the current folder" echo "Are you running in the XcodeBenchmark folder?" + exit 1 fi