Merge pull request #481 from ably/fix-xcode-15

fix: Ably causes runner to crash in XCode 15
ably · Sep 26, 2023 · 36d02f5 · 36d02f5
2 parents 42dec31 + acf10a1
commit 36d02f5
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 17 deletions.
diff --git a/example/ios/Podfile b/example/ios/Podfile
@@ -38,4 +38,11 @@ post_install do |installer|
   installer.pods_project.targets.each do |target|
     flutter_additional_ios_build_settings(target)
   end
+  installer.generated_projects.each do |project|
+    project.targets.each do |target|
+      target.build_configurations.each do |config|
+        config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '10.0'
+      end
+    end
+  end
 end
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -1,11 +1,11 @@
 PODS:
-  - Ably (1.2.10):
-    - AblyDeltaCodec (= 1.3.2)
+  - Ably (1.2.21):
+    - AblyDeltaCodec (= 1.3.3)
     - msgpack (= 0.4.0)
   - ably_flutter (1.2.18):
-    - Ably (= 1.2.10)
+    - Ably (= 1.2.21)
     - Flutter
-  - AblyDeltaCodec (1.3.2)
+  - AblyDeltaCodec (1.3.3)
   - device_info_plus (0.0.1):
     - Flutter
   - Flutter (1.0.0)
@@ -44,16 +44,16 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/fluttertoast/ios"
 
 SPEC CHECKSUMS:
-  Ably: 80be962e2e87bac69727a26ba72b868c8e86288e
-  ably_flutter: 9de75b5ca387b7ae2662e85e19f30ac9f9060986
-  AblyDeltaCodec: 783d017270de70bbbc0a84e4235297b225d33636
+  Ably: b4fca530b001b0d4ed8e10f29193649c2cce9435
+  ably_flutter: 3539b7783c3e3c3845dc214606bae496c7b41de7
+  AblyDeltaCodec: add5d06a756b3581b12aab5b5500a320b8c55bea
   device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed
-  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
+  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
   fluttertoast: 6122fa75143e992b1d3470f61000f591a798cc58
   msgpack: c85f6251873059738472ae136951cec5f30f3251
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
 
-PODFILE CHECKSUM: fe0e1ee7f3d1f7d00b11b474b62dd62134535aea
+PODFILE CHECKSUM: 1e2c1b20be30d932ecf4aea37c7fa8602c49c7fa
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.12.1
diff --git a/ios/Classes/codec/AblyFlutterReader.m b/ios/Classes/codec/AblyFlutterReader.m
@@ -150,11 +150,14 @@ use an explicitly received null from Dart (manifesting this side as a nil id)
     // channelRetryTimeout, asyncHttpThreadpoolSize, pushFullWait
     // track @ https://github.com/ably/ably-flutter/issues/14
 
-    [clientOptions addAgent:@"ably-flutter" version:FLUTTER_PACKAGE_PLUGIN_VERSION];
+    NSMutableDictionary *const clientAgents = [[NSMutableDictionary alloc]init];
+    [clientAgents setObject:FLUTTER_PACKAGE_PLUGIN_VERSION forKey:@"ably-flutter"];
     ON_VALUE(^(const id value) {
-        [clientOptions addAgent:@"dart" version:value];
+        [clientAgents setObject:value forKey:@"dart"];
     }, dictionary, TxClientOptions_dartVersion);
 
+    clientOptions.agents = clientAgents;
+
     return  [[AblyFlutterClientOptions alloc]
              initWithClientOptions:clientOptions
              hasAuthCallback:dictionary[TxClientOptions_hasAuthCallback]];

diff --git a/ios/ably_flutter.podspec b/ios/ably_flutter.podspec
@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
   s.source_files = 'Classes/**/*'
   s.public_header_files = 'Classes/**/*.h'
   s.dependency 'Flutter'
-  s.dependency 'Ably', '1.2.10'
+  s.dependency 'Ably', '1.2.21'
   s.platform = :ios
   s.ios.deployment_target  = '10.0'
 

diff --git a/test_integration/ios/Podfile.lock b/test_integration/ios/Podfile.lock
@@ -1,11 +1,11 @@
 PODS:
-  - Ably (1.2.10):
-    - AblyDeltaCodec (= 1.3.2)
+  - Ably (1.2.21):
+    - AblyDeltaCodec (= 1.3.3)
     - msgpack (= 0.4.0)
   - ably_flutter (1.2.18):
-    - Ably (= 1.2.10)
+    - Ably (= 1.2.21)
     - Flutter
-  - AblyDeltaCodec (1.3.2)
+  - AblyDeltaCodec (1.3.3)
   - Flutter (1.0.0)
   - msgpack (0.4.0)