Merge branch 'bug/reactivation' into feature/update-ably-cocoa-1.2.6

ably · Oct 12, 2021 · 2cb8e99 · 2cb8e99
2 parents 7fb9875 + 13dcfbb
commit 2cb8e99
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 23 deletions.
diff --git a/ios/Classes/handlers/PushActivationEventHandlers.swift b/ios/Classes/handlers/PushActivationEventHandlers.swift
@@ -32,7 +32,7 @@ public class PushActivationEventHandlers: NSObject, ARTPushRegistererDelegate {
 
     public func didActivateAblyPush(_ error: ARTErrorInfo?) {
         defer {
-            flutterResultForDeactivate = nil
+            flutterResultForActivate = nil
         }
 
         guard let result = flutterResultForActivate else {

diff --git a/test_integration/ios/Podfile b/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.

diff --git a/test_integration/ios/Podfile.lock b/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