Merge pull request #164 from sbenedicadb/dev-v5.0.0

point to staging branches and merge main in
adobe · Mar 19, 2024 · 30f2820 · 30f2820
2 parents e53f1e0 + b3c9ee7
commit 30f2820
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 30 deletions.
diff --git a/Podfile b/Podfile
@@ -4,6 +4,9 @@ platform :ios, '12.0'
 # Comment the next line if you don't want to use dynamic frameworks
 use_frameworks!
 
+$dev_repo = 'https://github.com/adobe/aepsdk-core-ios.git'
+$dev_branch = 'staging'
+
 workspace 'AEPTarget'
 project 'AEPTarget.xcodeproj'
 
@@ -19,9 +22,9 @@ def lib_main
 end
 
 def lib_dev
-    pod 'AEPCore', :git => 'https://github.com/adobe/aepsdk-core-ios.git', :branch => 'dev-v5.0.0'
-    pod 'AEPServices', :git => 'https://github.com/adobe/aepsdk-core-ios.git', :branch => 'dev-v5.0.0'
-    pod 'AEPRulesEngine', :git => 'https://github.com/adobe/aepsdk-rulesengine-ios.git', :branch => 'dev-v5.0.0'
+    pod 'AEPCore', :git => $dev_repo, :branch => $dev_branch
+    pod 'AEPServices', :git => $dev_repo, :branch => $dev_branch
+    pod 'AEPRulesEngine', :git => 'https://github.com/adobe/aepsdk-rulesengine-ios.git', :branch => $dev_branch
 end
 
 def app_main
@@ -36,14 +39,14 @@ def app_main
 end
 
 def app_dev
-    pod 'AEPCore', :git => 'https://github.com/adobe/aepsdk-core-ios.git', :branch => 'dev-v5.0.0'
-    pod 'AEPServices', :git => 'https://github.com/adobe/aepsdk-core-ios.git', :branch => 'dev-v5.0.0'
-    pod 'AEPRulesEngine', :git => 'https://github.com/adobe/aepsdk-rulesengine-ios.git', :branch => 'dev-v5.0.0'
-    pod 'AEPIdentity', :git => 'https://github.com/adobe/aepsdk-core-ios.git', :branch => 'dev-v5.0.0'
-    pod 'AEPLifecycle', :git => 'https://github.com/adobe/aepsdk-core-ios.git', :branch => 'dev-v5.0.0'
-    pod 'AEPSignal', :git => 'https://github.com/adobe/aepsdk-core-ios.git', :branch => 'dev-v5.0.0'
+    pod 'AEPCore', :git => $dev_repo, :branch => $dev_branch
+    pod 'AEPServices', :git => $dev_repo, :branch => $dev_branch
+    pod 'AEPRulesEngine', :git => 'https://github.com/adobe/aepsdk-rulesengine-ios.git', :branch => $dev_branch
+    pod 'AEPIdentity', :git => $dev_repo, :branch => $dev_branch
+    pod 'AEPLifecycle', :git => $dev_repo, :branch => $dev_branch
+    pod 'AEPSignal', :git => $dev_repo, :branch => $dev_branch
     pod 'AEPAnalytics'
-#    pod 'AEPAssurance'
+    pod 'AEPAssurance', :git => 'https://github.com/adobe/aepsdk-assurance-ios.git', :branch => $dev_branch
 end
 
 # ==================

diff --git a/Podfile.lock b/Podfile.lock
@@ -2,6 +2,9 @@ PODS:
   - AEPAnalytics (4.0.0):
     - AEPCore (>= 4.0.0)
     - AEPServices (>= 4.0.0)
+  - AEPAssurance (5.0.0):
+    - AEPCore (< 6.0.0, >= 5.0.0)
+    - AEPServices (< 6.0.0, >= 5.0.0)
   - AEPCore (5.0.0):
     - AEPRulesEngine (< 6.0.0, >= 5.0.0)
     - AEPServices (< 6.0.0, >= 5.0.0)
@@ -18,12 +21,13 @@ PODS:
 
 DEPENDENCIES:
   - AEPAnalytics
-  - AEPCore (from `https://github.com/adobe/aepsdk-core-ios.git`, branch `dev-v5.0.0`)
-  - AEPIdentity (from `https://github.com/adobe/aepsdk-core-ios.git`, branch `dev-v5.0.0`)
-  - AEPLifecycle (from `https://github.com/adobe/aepsdk-core-ios.git`, branch `dev-v5.0.0`)
-  - AEPRulesEngine (from `https://github.com/adobe/aepsdk-rulesengine-ios.git`, branch `dev-v5.0.0`)
-  - AEPServices (from `https://github.com/adobe/aepsdk-core-ios.git`, branch `dev-v5.0.0`)
-  - AEPSignal (from `https://github.com/adobe/aepsdk-core-ios.git`, branch `dev-v5.0.0`)
+  - AEPAssurance (from `https://github.com/adobe/aepsdk-assurance-ios.git`, branch `staging`)
+  - AEPCore (from `https://github.com/adobe/aepsdk-core-ios.git`, branch `staging`)
+  - AEPIdentity (from `https://github.com/adobe/aepsdk-core-ios.git`, branch `staging`)
+  - AEPLifecycle (from `https://github.com/adobe/aepsdk-core-ios.git`, branch `staging`)
+  - AEPRulesEngine (from `https://github.com/adobe/aepsdk-rulesengine-ios.git`, branch `staging`)
+  - AEPServices (from `https://github.com/adobe/aepsdk-core-ios.git`, branch `staging`)
+  - AEPSignal (from `https://github.com/adobe/aepsdk-core-ios.git`, branch `staging`)
   - SwiftLint (= 0.52.0)
   - SwiftyJSON (~> 5.0)
 
@@ -34,47 +38,54 @@ SPEC REPOS:
     - SwiftyJSON
 
 EXTERNAL SOURCES:
+  AEPAssurance:
+    :branch: staging
+    :git: https://github.com/adobe/aepsdk-assurance-ios.git
   AEPCore:
-    :branch: dev-v5.0.0
+    :branch: staging
     :git: https://github.com/adobe/aepsdk-core-ios.git
   AEPIdentity:
-    :branch: dev-v5.0.0
+    :branch: staging
     :git: https://github.com/adobe/aepsdk-core-ios.git
   AEPLifecycle:
-    :branch: dev-v5.0.0
+    :branch: staging
     :git: https://github.com/adobe/aepsdk-core-ios.git
   AEPRulesEngine:
-    :branch: dev-v5.0.0
+    :branch: staging
     :git: https://github.com/adobe/aepsdk-rulesengine-ios.git
   AEPServices:
-    :branch: dev-v5.0.0
+    :branch: staging
     :git: https://github.com/adobe/aepsdk-core-ios.git
   AEPSignal:
-    :branch: dev-v5.0.0
+    :branch: staging
     :git: https://github.com/adobe/aepsdk-core-ios.git
 
 CHECKOUT OPTIONS:
+  AEPAssurance:
+    :commit: 6098c48a067daf4c70cb630b0000564552ad3bc7
+    :git: https://github.com/adobe/aepsdk-assurance-ios.git
   AEPCore:
-    :commit: ff1f00c9895be50f87414a2085ef234edd63081b
+    :commit: f44b7b0d66e2c6a1454b51ed5a9d835bfbc2a8f9
     :git: https://github.com/adobe/aepsdk-core-ios.git
   AEPIdentity:
-    :commit: ff1f00c9895be50f87414a2085ef234edd63081b
+    :commit: f44b7b0d66e2c6a1454b51ed5a9d835bfbc2a8f9
     :git: https://github.com/adobe/aepsdk-core-ios.git
   AEPLifecycle:
-    :commit: ff1f00c9895be50f87414a2085ef234edd63081b
+    :commit: f44b7b0d66e2c6a1454b51ed5a9d835bfbc2a8f9
     :git: https://github.com/adobe/aepsdk-core-ios.git
   AEPRulesEngine:
-    :commit: 01bd861e9df32b4d2dc784b2b94d87835e813c53
+    :commit: 814672b136b6c71ab529a3f1366f3bf16cd9a532
     :git: https://github.com/adobe/aepsdk-rulesengine-ios.git
   AEPServices:
-    :commit: ff1f00c9895be50f87414a2085ef234edd63081b
+    :commit: f44b7b0d66e2c6a1454b51ed5a9d835bfbc2a8f9
     :git: https://github.com/adobe/aepsdk-core-ios.git
   AEPSignal:
-    :commit: ff1f00c9895be50f87414a2085ef234edd63081b
+    :commit: f44b7b0d66e2c6a1454b51ed5a9d835bfbc2a8f9
     :git: https://github.com/adobe/aepsdk-core-ios.git
 
 SPEC CHECKSUMS:
   AEPAnalytics: a510eb9653fac7f913965ad4291c8d51f74ffdcd
+  AEPAssurance: 7f260ded4df38a70a06efebade8c33a3e3221984
   AEPCore: f1c3e9238bb12e7e1103f4407c341ebc65aeab5b
   AEPIdentity: a65c1eba43a06f01b0dab191b27a53a81adada57
   AEPLifecycle: d4e0e1e86d6225d87203875d67f56c48f7ab7f67
@@ -84,6 +95,6 @@ SPEC CHECKSUMS:
   SwiftLint: 13280e21cdda6786ad908dc6e416afe5acd1fcb7
   SwiftyJSON: 2f33a42c6fbc52764d96f13368585094bfd8aa5e
 
-PODFILE CHECKSUM: 3acfa787113b8ba40c64c19d21670c52291b99e9
+PODFILE CHECKSUM: ae275201056492cde01fa3f2eddf9516d67aec22
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.15.0