Update Ably-cocoa dependency to 1.2.6

CONTRIBUTING.md

@@ -90,6 +90,17 @@ To debug both platform and Dart code simultaneously:
 - In Android: in the Flutter project window, launch the application in debug mode in Android Studio. Then, in the Android project window, attach the debugger to the Android process.
 - In iOS: To debug iOS code, you must set breakpoints in Xcode. In Android Studio or command line, run the flutter run --dart-define` command you would usually run. This ensures when you build with Xcode, the environment variables are available to the app. Then, re-run the application using Xcode. Then, in Android Studio, click `Run` > `Flutter Attach`, or click the `Flutter Attach` button.
 
+## Testing changes in dependencies
+
+After making changes to Ably-java or Ably-cocoa, you can test changes without releasing those dependencies to users. To do this, you need a local copy of the repo with the changes you want to test.
+
+To test Ably-cocoa changes, in `Podfile`, below `target 'Runner' do`, add:
+```ruby
+    pod 'Ably', :path => 'local/path/to/ably-cocoa'
+```
+
+To test Ably-java changes, see [Using ably-java / ably-android locally in other projects](https://github.com/ably/ably-java/blob/main/CONTRIBUTING.md#building-an-android-archive-aar-file-locally).
+
 ## Writing documentation
 
 As features are developed, ensure documentation (both in the public API interface) and in relevant markdown files are updated. When referencing images in markdown files, using a local path such as `images/android.png`, for example `![An android device running on API level 30](images/android.png)` will result in the image missing on pub.dev README preview. Therefore, we currently reference images through the github.com URL path (`https://github.com/ably/ably-flutter/raw/`), for example to reference `images/android.png`, we would use `![An android device running on API level 30](https://github.com/ably/ably-flutter/raw/main/images/android.png)`. [A suggestion](https://github.com/dart-lang/pub-dev/issues/5068) has been made to automatically replace this relative image path to the github URL path.

example/ios/Podfile.lock

@@ -1,13 +1,11 @@
 PODS:
-  - Ably (1.2.4):
-    - AblyDeltaCodec (= 1.2.0)
-    - msgpack (= 0.3.1)
-    - SocketRocketAblyFork (= 0.5.2-ably-8)
-    - ULID (= 1.1.0)
+  - Ably (1.2.6):
+    - AblyDeltaCodec (= 1.3.1)
+    - msgpack (= 0.4.0)
   - ably_flutter (0.0.5):
-    - Ably (= 1.2.4)
+    - Ably (= 1.2.6)
     - Flutter
-  - AblyDeltaCodec (1.2.0)
+  - AblyDeltaCodec (1.3.1)
   - device_info_plus (0.0.1):
     - Flutter
   - Flutter (1.0.0)
@@ -16,12 +14,11 @@ PODS:
   - fluttertoast (0.0.2):
     - Flutter
     - Toast
-  - msgpack (0.3.1)
-  - SocketRocketAblyFork (0.5.2-ably-8)
+  - msgpack (0.4.0)
   - Toast (4.0.0)
-  - ULID (1.1.0)
 
 DEPENDENCIES:
+  - Ably (from `/Users/zen/repos/ably/ably-cocoa`)
   - ably_flutter (from `.symlinks/plugins/ably_flutter/ios`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - Flutter (from `Flutter`)
@@ -30,14 +27,13 @@ DEPENDENCIES:
 
 SPEC REPOS:
   trunk:
-    - Ably
     - AblyDeltaCodec
     - msgpack
-    - SocketRocketAblyFork
     - Toast
-    - ULID
 
 EXTERNAL SOURCES:
+  Ably:
+    :path: "/Users/zen/repos/ably/ably-cocoa"
   ably_flutter:
     :path: ".symlinks/plugins/ably_flutter/ios"
   device_info_plus:
@@ -50,18 +46,16 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/fluttertoast/ios"
 
 SPEC CHECKSUMS:
-  Ably: 863d35bb6a6aa5fc537304ef19f85cfa51d1bbde
-  ably_flutter: 04d8c843fa12aafe0d1c6947a5ed3009b1958e3a
-  AblyDeltaCodec: 6123f31df5b04a0f5452968505a46ba16a9eb689
+  Ably: 6f58ab63407c71f984ef61112f60525cf9bc634a
+  ably_flutter: 80537c79ba7cdb1ced594e45c2089bc3ffee1349
+  AblyDeltaCodec: f66a44f743b2a0703f29a65208321d4ea43362d6
   device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed
   Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
   flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
   fluttertoast: 6122fa75143e992b1d3470f61000f591a798cc58
-  msgpack: a14de9216d29cfd0a7aff5af5150601a27e899a4
-  SocketRocketAblyFork: e6e3d820bf8ff9e6265d2af81b9f11f270351ea6
+  msgpack: c85f6251873059738472ae136951cec5f30f3251
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
-  ULID: b4714891a02819364faecd574a53e391c4c6de9d
 
-PODFILE CHECKSUM: fe0e1ee7f3d1f7d00b11b474b62dd62134535aea
+PODFILE CHECKSUM: 12fc496d05e3edce1edab81c94842b2861090e5a
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.10.2

example/ios/Runner.xcodeproj/project.pbxproj

@@ -235,9 +235,7 @@
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/Ably/Ably.framework",
 				"${BUILT_PRODUCTS_DIR}/AblyDeltaCodec/AblyDeltaCodec.framework",
-				"${BUILT_PRODUCTS_DIR}/SocketRocketAblyFork/SocketRocketAblyFork.framework",
 				"${BUILT_PRODUCTS_DIR}/Toast/Toast.framework",
-				"${BUILT_PRODUCTS_DIR}/ULID/ULID.framework",
 				"${BUILT_PRODUCTS_DIR}/ably_flutter/ably_flutter.framework",
 				"${BUILT_PRODUCTS_DIR}/device_info_plus/device_info_plus.framework",
 				"${BUILT_PRODUCTS_DIR}/flutter_local_notifications/flutter_local_notifications.framework",
@@ -248,9 +246,7 @@
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Ably.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AblyDeltaCodec.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SocketRocketAblyFork.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Toast.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ULID.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ably_flutter.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info_plus.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_local_notifications.framework",

ios/Classes/AblyFlutter.m

@@ -57,10 +57,9 @@ -(NSNumber *)createRestWithOptions:(AblyFlutterClientOptions *const)options {
                                arguments:message
                                   result:^(id tokenData){
                 if (!tokenData) {
-                    NSLog(@"No token data recieved %@", tokenData);
+                    NSLog(@"No token data received %@", tokenData);
                     callback(nil, [NSError errorWithDomain:ARTAblyErrorDomain
-                                                      code:ARTCodeErrorAuthConfiguredProviderFailure
-                                                  userInfo:nil]); //TODO check if this is okay!
+                                                      code:ARTErrorAuthConfiguredProviderFailure userInfo:nil]);
                 } if ([tokenData isKindOfClass:[FlutterError class]]) {
                     NSLog(@"Error getting token data %@", tokenData);
                     callback(nil, tokenData);
@@ -96,8 +95,7 @@ -(NSNumber *)createRealtimeWithOptions:(AblyFlutterClientOptions *const)options
                 if (!tokenData) {
                     NSLog(@"No token data received %@", tokenData);
                     callback(nil, [NSError errorWithDomain:ARTAblyErrorDomain
-                                                      code:ARTCodeErrorAuthConfiguredProviderFailure
-                                                  userInfo:nil]); //TODO check if this is okay!
+                                                      code:ARTErrorAuthConfiguredProviderFailure userInfo:nil]);
                 } if ([tokenData isKindOfClass:[FlutterError class]]) {
                     NSLog(@"Error getting token data %@", tokenData);
                     callback(nil, tokenData);

ios/ably_flutter.podspec

@@ -1,6 +1,6 @@
 #
 # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html.
-# Run `pod lib lint ably_flutter.podspec' to validate before publishing.
+# Run `pod lib lint ably_flutter.podspec` to validate before publishing.
 #
 Pod::Spec.new do |s|
   s.name             = 'ably_flutter'
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
   s.source_files = 'Classes/**/*'
   s.public_header_files = 'Classes/**/*.h'
   s.dependency 'Flutter'
-  s.dependency 'Ably', '1.2.4'
+  s.dependency 'Ably', '1.2.6'
   s.platform = :ios
   s.ios.deployment_target  = '10.0'
 

test_integration/ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '9.0'
+platform :ios, '10.0'
 use_frameworks!
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.

test_integration/ios/Podfile.lock

@@ -1,17 +1,13 @@
 PODS:
-  - Ably (1.2.4):
-    - AblyDeltaCodec (= 1.2.0)
-    - msgpack (= 0.3.1)
-    - SocketRocketAblyFork (= 0.5.2-ably-8)
-    - ULID (= 1.1.0)
+  - Ably (1.2.6):
+    - AblyDeltaCodec (= 1.3.1)
+    - msgpack (= 0.4.0)
   - ably_flutter (0.0.5):
-    - Ably (= 1.2.4)
+    - Ably (= 1.2.6)
     - Flutter
-  - AblyDeltaCodec (1.2.0)
+  - AblyDeltaCodec (1.3.1)
   - Flutter (1.0.0)
-  - msgpack (0.3.1)
-  - SocketRocketAblyFork (0.5.2-ably-8)
-  - ULID (1.1.0)
+  - msgpack (0.4.0)
 
 DEPENDENCIES:
   - ably_flutter (from `.symlinks/plugins/ably_flutter/ios`)
@@ -22,8 +18,6 @@ SPEC REPOS:
     - Ably
     - AblyDeltaCodec
     - msgpack
-    - SocketRocketAblyFork
-    - ULID
 
 EXTERNAL SOURCES:
   ably_flutter:
@@ -32,14 +26,12 @@ EXTERNAL SOURCES:
     :path: Flutter
 
 SPEC CHECKSUMS:
-  Ably: 863d35bb6a6aa5fc537304ef19f85cfa51d1bbde
-  ably_flutter: f2235538e3cbee569611031a76163dfb56250ed1
-  AblyDeltaCodec: 6123f31df5b04a0f5452968505a46ba16a9eb689
-  Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
-  msgpack: a14de9216d29cfd0a7aff5af5150601a27e899a4
-  SocketRocketAblyFork: e6e3d820bf8ff9e6265d2af81b9f11f270351ea6
-  ULID: b4714891a02819364faecd574a53e391c4c6de9d
+  Ably: 6f58ab63407c71f984ef61112f60525cf9bc634a
+  ably_flutter: 80537c79ba7cdb1ced594e45c2089bc3ffee1349
+  AblyDeltaCodec: f66a44f743b2a0703f29a65208321d4ea43362d6
+  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
+  msgpack: c85f6251873059738472ae136951cec5f30f3251
 
-PODFILE CHECKSUM: 7d251af3d33bd11d1f2d86f8fb2d423bf85567b7
+PODFILE CHECKSUM: f2c6cc511583caab2c65ac3f5766428391d93d34
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.10.2