Merge pull request #2442 from onevcat/fix/xcode-26-macos

Fix crash on setting indicator on macOS 26

Author: onevcat

.github/workflows/build.yaml

@@ -27,10 +27,10 @@ jobs:
           'watchOS Simulator,name=Apple Watch Series 9 (41mm),OS=10.5'
         ]
         xcode: [
-          '15.2',
-          '15.3',
           '16.0',
           '16.1',
+          '16.2',
+          '16.3',
         ]
     steps:
       - uses: actions/checkout@v4

.github/workflows/test.yaml

@@ -22,13 +22,13 @@ jobs:
       matrix:
         destination: [
           'macOS', 
-          'iOS Simulator,name=iPhone 15,OS=17.5', 
-          'tvOS Simulator,name=Apple TV,OS=17.5', 
-          'watchOS Simulator,name=Apple Watch Series 9 (41mm),OS=10.5'
+          'iOS Simulator,name=iPhone 16,OS=18.5', 
+          'tvOS Simulator,name=Apple TV,OS=18.5', 
+          'watchOS Simulator,name=Apple Watch Series 10 (42mm),OS=11.5'
         ]
         xcode: [
-          '15.4',
-          '16.2',
+          '16.4',
+          '26.0.1',
         ]
     steps:
       - uses: actions/checkout@v4

Gemfile.lock

@@ -5,7 +5,7 @@ GEM
       base64
       nkf
       rexml
-    activesupport (7.2.2.1)
+    activesupport (7.2.2.2)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -25,27 +25,28 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1118.0)
-    aws-sdk-core (3.226.0)
+    aws-partitions (1.1168.0)
+    aws-sdk-core (3.233.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
       base64
+      bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.105.0)
-      aws-sdk-core (~> 3, >= 3.225.0)
+    aws-sdk-kms (1.113.0)
+      aws-sdk-core (~> 3, >= 3.231.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.190.0)
-      aws-sdk-core (~> 3, >= 3.225.0)
+    aws-sdk-s3 (1.199.1)
+      aws-sdk-core (~> 3, >= 3.231.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.3.0)
     benchmark (0.4.1)
-    bigdecimal (3.2.2)
+    bigdecimal (3.2.3)
     claide (1.1.0)
     cocoapods (1.16.2)
       addressable (~> 2.8)
@@ -89,7 +90,7 @@ GEM
     commander (4.6.0)
       highline (~> 2.0.0)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
+    connection_pool (2.5.4)
     declarative (0.0.20)
     digest-crc (0.7.0)
       rake (>= 12.0.0, < 14.0.0)
@@ -98,7 +99,7 @@ GEM
     drb (2.2.3)
     emoji_regex (3.2.3)
     escape (0.0.4)
-    ethon (0.16.0)
+    ethon (0.17.0)
       ffi (>= 1.15.0)
     excon (0.112.0)
     faraday (1.10.4)
@@ -222,15 +223,15 @@ GEM
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
-    json (2.12.2)
-    jwt (2.10.1)
+    json (2.15.0)
+    jwt (2.10.2)
       base64
     logger (1.7.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
     minitest (5.25.5)
     molinillo (0.8.0)
-    multi_json (1.15.0)
+    multi_json (1.17.0)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
     nanaimo (0.4.0)
@@ -248,17 +249,17 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.4.2)
+    rexml (3.4.4)
     rouge (3.28.0)
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
     rubyzip (2.4.1)
     securerandom (0.4.1)
     security (0.1.5)
-    signet (0.20.0)
+    signet (0.21.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 3.0)
+      jwt (>= 1.5, < 4.0)
       multi_json (~> 1.10)
     simctl (1.6.10)
       CFPropertyList

Sources/Views/Indicator.swift

@@ -152,7 +152,7 @@ final class ActivityIndicator: Indicator {
     init() {
         #if os(macOS)
             activityIndicatorView = NSProgressIndicator(frame: CGRect(x: 0, y: 0, width: 16, height: 16))
-            activityIndicatorView.controlSize = .small
+            activityIndicatorView.controlSize = .regular
             activityIndicatorView.style = .spinning
         #else
             let indicatorStyle: UIActivityIndicatorView.Style

fastlane/Fastfile

@@ -6,9 +6,9 @@ platform :ios do
   desc "Runs all the tests"
   lane :tests do
     test(destination: "platform=macOS")
-    test(destination: "platform=iOS Simulator,name=iPhone 15,OS=17.5")
-    test(destination: "platform=tvOS Simulator,name=Apple TV,OS=17.5")
-    build(destination: "platform=watchOS Simulator,name=Apple Watch Series 9 (41mm),OS=10.5")
+    test(destination: "platform=iOS Simulator,name=iPhone 16,OS=18.5")
+    test(destination: "platform=tvOS Simulator,name=Apple TV,OS=18.5")
+    build(destination: "platform=watchOS Simulator,name=Apple Watch Series 10 (42mm),OS=11.5")
   end
 
   lane :test_ci do
@@ -93,7 +93,7 @@ platform :ios do
   lane :xcframework do |options|
     version = options[:version]
     swift_version = options[:swift_version] || "5.0"
-    xcode_version = options[:xcode_version] || "16.4"
+    xcode_version = options[:xcode_version] || "26.0.1"
 
     xcodes(version: xcode_version, select_for_current_build_only: true)
     FileUtils.rm_rf '../build'
@@ -166,7 +166,7 @@ platform :ios do
   end
 
   before_all do |lane|
-    xcode_version = ENV["XCODE_VERSION"] || "16.4"
+    xcode_version = ENV["XCODE_VERSION"] || "26.0.1"
     xcodes(version: xcode_version, select_for_current_build_only: true)
   end