From 6316869217c9c3b7817b450aae4a662d7506a5c0 Mon Sep 17 00:00:00 2001
From: Swarna Saraf <swsaraf@adobe.com>
Date: Fri, 27 May 2022 14:01:09 -0700
Subject: [PATCH] Updated pod dependencies (#48)

* Updated pods

* Testable runtime fixes after Mobile Core update

* Updated xcode version in circleci .yml to match Core.
---
 .circleci/config.yml                          |  2 +-
 Podfile.lock                                  | 30 +++++++++----------
 .../TestableExtensionRuntime.swift            |  8 +++++
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 659ff56..64377b8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,7 +14,7 @@ jobs:
 
   build-and-test:
     macos:
-      xcode: 11.6.0 # Specify the Xcode version to use
+      xcode: 12.0.1 # Specify the Xcode version to use
 
     steps:
       - checkout
diff --git a/Podfile.lock b/Podfile.lock
index 97b72b5..1b54a95 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -2,9 +2,9 @@ PODS:
   - AEPAssurance (3.0.1):
     - AEPCore (>= 3.1.0)
     - AEPServices (>= 3.1.0)
-  - AEPCore (3.5.0):
+  - AEPCore (3.6.0):
     - AEPRulesEngine (>= 1.1.0)
-    - AEPServices (>= 3.5.0)
+    - AEPServices (>= 3.6.0)
   - AEPEdge (1.4.0):
     - AEPCore (>= 3.5.0)
     - AEPEdgeIdentity
@@ -13,14 +13,14 @@ PODS:
     - AEPEdge (>= 1.4.0)
   - AEPEdgeIdentity (1.0.1):
     - AEPCore (>= 3.1.1)
-  - AEPIdentity (3.5.0):
-    - AEPCore (>= 3.5.0)
-  - AEPLifecycle (3.5.0):
-    - AEPCore (>= 3.5.0)
+  - AEPIdentity (3.6.0):
+    - AEPCore (>= 3.6.0)
+  - AEPLifecycle (3.6.0):
+    - AEPCore (>= 3.6.0)
   - AEPRulesEngine (1.1.0)
-  - AEPServices (3.5.0)
-  - AEPSignal (3.5.0):
-    - AEPCore (>= 3.5.0)
+  - AEPServices (3.6.0)
+  - AEPSignal (3.6.0):
+    - AEPCore (>= 3.6.0)
   - SwiftLint (0.44.0)
 
 DEPENDENCIES:
@@ -50,17 +50,17 @@ SPEC REPOS:
 
 SPEC CHECKSUMS:
   AEPAssurance: b25880cd4b14f22c61a1dce19807bd0ca0fe9b17
-  AEPCore: a3b4159038df33b63ebdab227342cd57d8ded1b0
+  AEPCore: 03a89f8b792a74e17f739ab535982569d6639b76
   AEPEdge: 0e7c11d13e71d23d995bff46f48691c1bb65f84f
   AEPEdgeConsent: a23b35ab331d2aa2013fcef49c9d6b80085d5597
   AEPEdgeIdentity: 5c42cef81835851232136a9e1fbbbe33b204ee11
-  AEPIdentity: d7745fc4df403b7281b18fa7df917e68f061c9b2
-  AEPLifecycle: d3ff90c661c4452fb1c619e7f02dad8ba49a8fd2
+  AEPIdentity: bd5c639f2ddb02e2b15f909c661235ccd86bd98a
+  AEPLifecycle: 7c0452a650a8ccaaa2473a3625a7004e8687797e
   AEPRulesEngine: bb2927ed5501ddf9754c66e97f8d2b1cf8e33b19
-  AEPServices: 2e869a387b67c04ab5f3f647026412ff410efbb0
-  AEPSignal: 636e615dd02d670aa0fe6c2b9dcebee6c95e1f4f
+  AEPServices: fd41aa2d0eda1e6939ae00a99f8431a57d09e1ca
+  AEPSignal: bbdb296030fec8239fb316576f40b230267fcf7c
   SwiftLint: e96c0a8c770c7ebbc4d36c55baf9096bb65c4584
 
 PODFILE CHECKSUM: f6f726ec88e11f1f1f453e55b14bffaeff570744
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.11.3
diff --git a/Tests/AEPOptimizeTests/FunctionalTests/TestHelpers/TestableExtensionRuntime.swift b/Tests/AEPOptimizeTests/FunctionalTests/TestHelpers/TestableExtensionRuntime.swift
index 5a0ac29..3e8e309 100644
--- a/Tests/AEPOptimizeTests/FunctionalTests/TestHelpers/TestableExtensionRuntime.swift
+++ b/Tests/AEPOptimizeTests/FunctionalTests/TestHelpers/TestableExtensionRuntime.swift
@@ -50,6 +50,10 @@ class TestableExtensionRuntime: ExtensionRuntime {
     }
 
     func getSharedState(extensionName: String, event: Event?, barrier: Bool) -> SharedStateResult? {
+        getSharedState(extensionName: extensionName, event: event, barrier: barrier, resolution: .any)
+    }
+
+    func getSharedState(extensionName: String, event: Event?, barrier: Bool, resolution: SharedStateResolution = .any) -> SharedStateResult? {
         // if there is an shared state setup for the specific (extension, event id) pair, return it. Otherwise, return the shared state that is setup for the extension.
         if let id = event?.id {
             return mockedSharedStates["\(extensionName)-\(id)"] ?? mockedSharedStates["\(extensionName)"]
@@ -68,6 +72,10 @@ class TestableExtensionRuntime: ExtensionRuntime {
     }
 
     func getXDMSharedState(extensionName: String, event: Event?, barrier: Bool = false) -> SharedStateResult? {
+        getXDMSharedState(extensionName: extensionName, event: event, barrier: barrier, resolution: .any)
+    }
+
+    func getXDMSharedState(extensionName: String, event: Event?, barrier: Bool, resolution: SharedStateResolution = .any) -> SharedStateResult? {
         // if there is an shared state setup for the specific (extension, event id) pair, return it. Otherwise, return the shared state that is setup for the extension.
         if let id = event?.id {
             return mockedXdmSharedStates["\(extensionName)-\(id)"] ?? mockedXdmSharedStates["\(extensionName)"]