revert: 在 merge 之前，先恢复 podfile 的修改

growingio · Sep 14, 2023 · 2e4fb0a · 2e4fb0a
1 parent 7cc4ad4
commit 2e4fb0a
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 78 deletions.
diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
@@ -1802,7 +1802,7 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/GrowingAPM/GrowingAPM.framework",
-				"${BUILT_PRODUCTS_DIR}/GrowingAnalytics-b7a754e5/GrowingAnalytics.framework",
+				"${BUILT_PRODUCTS_DIR}/GrowingAnalytics-4a08faf1/GrowingAnalytics.framework",
 				"${BUILT_PRODUCTS_DIR}/GrowingToolsKit/GrowingToolsKit.framework",
 				"${BUILT_PRODUCTS_DIR}/GrowingUtils-AutotrackerCore-TrackerCore/GrowingUtils.framework",
 				"${BUILT_PRODUCTS_DIR}/LBXScan/LBXScan.framework",

diff --git a/Podfile b/Podfile
@@ -15,7 +15,6 @@ target 'Example' do
 #  pod 'GrowingAnalytics/Hybrid', :path => './'
   pod 'GrowingAnalytics/Protobuf', :path => './'
   pod 'GrowingAnalytics/Advert', :path => './'
-  pod 'GrowingAnalytics/V2Adapter', :path => './'
 #  pod 'GrowingAnalytics/Flutter', :path => './'
 #  pod 'GrowingAnalytics/DISABLE_IDFA', :path => './' #禁用idfa
 
@@ -89,9 +88,6 @@ end
 
 post_install do |installer|
   installer.pods_project.targets.each do |target|
-    target.build_configurations.each do |config|
-      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
-    end
     if target.respond_to?(:product_type) and target.product_type == "com.apple.product-type.bundle"
       target.build_configurations.each do |config|
           config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,76 +1,71 @@
 PODS:
-  - GrowingAnalytics-cdp/Autotracker (3.4.8-hotfix.1):
-    - GrowingAnalytics/AutotrackerCore (= 3.4.8-hotfix.1)
-    - GrowingAnalytics/DefaultServices (= 3.4.8-hotfix.1)
-    - GrowingAnalytics/Hybrid (= 3.4.8-hotfix.1)
-    - GrowingAnalytics/MobileDebugger (= 3.4.8-hotfix.1)
-    - GrowingAnalytics/WebCircle (= 3.4.8-hotfix.1)
-  - GrowingAnalytics-cdp/Tracker (3.4.8-hotfix.1):
-    - GrowingAnalytics/DefaultServices (= 3.4.8-hotfix.1)
-    - GrowingAnalytics/MobileDebugger (= 3.4.8-hotfix.1)
-    - GrowingAnalytics/TrackerCore (= 3.4.8-hotfix.1)
-  - GrowingAnalytics/Advert (3.4.8-hotfix.1):
-    - GrowingAnalytics/TrackerCore (= 3.4.8-hotfix.1)
-  - GrowingAnalytics/APM (3.4.8-hotfix.1):
-    - GrowingAnalytics/TrackerCore (= 3.4.8-hotfix.1)
+  - GrowingAnalytics-cdp/Autotracker (3.5.0):
+    - GrowingAnalytics/AutotrackerCore (= 3.5.0)
+    - GrowingAnalytics/DefaultServices (= 3.5.0)
+    - GrowingAnalytics/Hybrid (= 3.5.0)
+    - GrowingAnalytics/MobileDebugger (= 3.5.0)
+    - GrowingAnalytics/WebCircle (= 3.5.0)
+  - GrowingAnalytics-cdp/Tracker (3.5.0):
+    - GrowingAnalytics/DefaultServices (= 3.5.0)
+    - GrowingAnalytics/MobileDebugger (= 3.5.0)
+    - GrowingAnalytics/TrackerCore (= 3.5.0)
+  - GrowingAnalytics/Advert (3.5.0):
+    - GrowingAnalytics/TrackerCore (= 3.5.0)
+  - GrowingAnalytics/APM (3.5.0):
+    - GrowingAnalytics/TrackerCore (= 3.5.0)
     - GrowingAPM/Core
-  - GrowingAnalytics/Autotracker (3.4.8-hotfix.1):
-    - GrowingAnalytics/AutotrackerCore (= 3.4.8-hotfix.1)
-    - GrowingAnalytics/DefaultServices (= 3.4.8-hotfix.1)
-    - GrowingAnalytics/Hybrid (= 3.4.8-hotfix.1)
-    - GrowingAnalytics/MobileDebugger (= 3.4.8-hotfix.1)
-    - GrowingAnalytics/WebCircle (= 3.4.8-hotfix.1)
-  - GrowingAnalytics/AutotrackerCore (3.4.8-hotfix.1):
-    - GrowingAnalytics/TrackerCore (= 3.4.8-hotfix.1)
+  - GrowingAnalytics/Autotracker (3.5.0):
+    - GrowingAnalytics/AutotrackerCore (= 3.5.0)
+    - GrowingAnalytics/DefaultServices (= 3.5.0)
+    - GrowingAnalytics/Hybrid (= 3.5.0)
+    - GrowingAnalytics/MobileDebugger (= 3.5.0)
+    - GrowingAnalytics/WebCircle (= 3.5.0)
+  - GrowingAnalytics/AutotrackerCore (3.5.0):
+    - GrowingAnalytics/TrackerCore (= 3.5.0)
     - GrowingUtils/AutotrackerCore (= 0.0.5)
-  - GrowingAnalytics/Compression (3.4.8-hotfix.1):
-    - GrowingAnalytics/TrackerCore (= 3.4.8-hotfix.1)
-  - GrowingAnalytics/Database (3.4.8-hotfix.1):
-    - GrowingAnalytics/TrackerCore (= 3.4.8-hotfix.1)
-  - GrowingAnalytics/DefaultServices (3.4.8-hotfix.1):
-    - GrowingAnalytics/Compression (= 3.4.8-hotfix.1)
-    - GrowingAnalytics/Database (= 3.4.8-hotfix.1)
-    - GrowingAnalytics/Encryption (= 3.4.8-hotfix.1)
-    - GrowingAnalytics/Network (= 3.4.8-hotfix.1)
-    - GrowingAnalytics/TrackerCore (= 3.4.8-hotfix.1)
-  - GrowingAnalytics/Encryption (3.4.8-hotfix.1):
-    - GrowingAnalytics/TrackerCore (= 3.4.8-hotfix.1)
-  - GrowingAnalytics/Hybrid (3.4.8-hotfix.1):
-    - GrowingAnalytics/TrackerCore (= 3.4.8-hotfix.1)
-  - GrowingAnalytics/MobileDebugger (3.4.8-hotfix.1):
-    - GrowingAnalytics/Screenshot (= 3.4.8-hotfix.1)
-    - GrowingAnalytics/TrackerCore (= 3.4.8-hotfix.1)
-    - GrowingAnalytics/WebSocket (= 3.4.8-hotfix.1)
-  - GrowingAnalytics/Network (3.4.8-hotfix.1):
-    - GrowingAnalytics/TrackerCore (= 3.4.8-hotfix.1)
-  - GrowingAnalytics/Protobuf (3.4.8-hotfix.1):
-    - GrowingAnalytics/Database (= 3.4.8-hotfix.1)
-    - GrowingAnalytics/Protobuf/Proto (= 3.4.8-hotfix.1)
-    - GrowingAnalytics/TrackerCore (= 3.4.8-hotfix.1)
-  - GrowingAnalytics/Protobuf/Proto (3.4.8-hotfix.1):
-    - GrowingAnalytics/Database (= 3.4.8-hotfix.1)
-    - GrowingAnalytics/TrackerCore (= 3.4.8-hotfix.1)
+  - GrowingAnalytics/Compression (3.5.0):
+    - GrowingAnalytics/TrackerCore (= 3.5.0)
+  - GrowingAnalytics/Database (3.5.0):
+    - GrowingAnalytics/TrackerCore (= 3.5.0)
+  - GrowingAnalytics/DefaultServices (3.5.0):
+    - GrowingAnalytics/Compression (= 3.5.0)
+    - GrowingAnalytics/Database (= 3.5.0)
+    - GrowingAnalytics/Encryption (= 3.5.0)
+    - GrowingAnalytics/Network (= 3.5.0)
+    - GrowingAnalytics/TrackerCore (= 3.5.0)
+  - GrowingAnalytics/Encryption (3.5.0):
+    - GrowingAnalytics/TrackerCore (= 3.5.0)
+  - GrowingAnalytics/Hybrid (3.5.0):
+    - GrowingAnalytics/TrackerCore (= 3.5.0)
+  - GrowingAnalytics/MobileDebugger (3.5.0):
+    - GrowingAnalytics/Screenshot (= 3.5.0)
+    - GrowingAnalytics/TrackerCore (= 3.5.0)
+    - GrowingAnalytics/WebSocket (= 3.5.0)
+  - GrowingAnalytics/Network (3.5.0):
+    - GrowingAnalytics/TrackerCore (= 3.5.0)
+  - GrowingAnalytics/Protobuf (3.5.0):
+    - GrowingAnalytics/Database (= 3.5.0)
+    - GrowingAnalytics/Protobuf/Proto (= 3.5.0)
+    - GrowingAnalytics/TrackerCore (= 3.5.0)
+  - GrowingAnalytics/Protobuf/Proto (3.5.0):
+    - GrowingAnalytics/Database (= 3.5.0)
+    - GrowingAnalytics/TrackerCore (= 3.5.0)
     - Protobuf
-  - GrowingAnalytics/Screenshot (3.4.8-hotfix.1):
+  - GrowingAnalytics/Screenshot (3.5.0):
     - GrowingAnalytics/TrackerCore
-  - GrowingAnalytics/Tracker (3.4.8-hotfix.1):
-    - GrowingAnalytics/DefaultServices (= 3.4.8-hotfix.1)
-    - GrowingAnalytics/MobileDebugger (= 3.4.8-hotfix.1)
-    - GrowingAnalytics/TrackerCore (= 3.4.8-hotfix.1)
-  - GrowingAnalytics/TrackerCore (3.4.8-hotfix.1):
+  - GrowingAnalytics/Tracker (3.5.0):
+    - GrowingAnalytics/DefaultServices (= 3.5.0)
+    - GrowingAnalytics/MobileDebugger (= 3.5.0)
+    - GrowingAnalytics/TrackerCore (= 3.5.0)
+  - GrowingAnalytics/TrackerCore (3.5.0):
     - GrowingUtils/TrackerCore (= 0.0.5)
-  - GrowingAnalytics/V2Adapter (3.4.8-hotfix.1):
-    - GrowingAnalytics/AutotrackerCore (= 3.4.8-hotfix.1)
-    - GrowingAnalytics/V2AdapterTrackOnly (= 3.4.8-hotfix.1)
-  - GrowingAnalytics/V2AdapterTrackOnly (3.4.8-hotfix.1):
-    - GrowingAnalytics/TrackerCore (= 3.4.8-hotfix.1)
-  - GrowingAnalytics/WebCircle (3.4.8-hotfix.1):
-    - GrowingAnalytics/AutotrackerCore (= 3.4.8-hotfix.1)
-    - GrowingAnalytics/Hybrid (= 3.4.8-hotfix.1)
-    - GrowingAnalytics/Screenshot (= 3.4.8-hotfix.1)
-    - GrowingAnalytics/WebSocket (= 3.4.8-hotfix.1)
-  - GrowingAnalytics/WebSocket (3.4.8-hotfix.1):
-    - GrowingAnalytics/TrackerCore (= 3.4.8-hotfix.1)
+  - GrowingAnalytics/WebCircle (3.5.0):
+    - GrowingAnalytics/AutotrackerCore (= 3.5.0)
+    - GrowingAnalytics/Hybrid (= 3.5.0)
+    - GrowingAnalytics/Screenshot (= 3.5.0)
+    - GrowingAnalytics/WebSocket (= 3.5.0)
+  - GrowingAnalytics/WebSocket (3.5.0):
+    - GrowingAnalytics/TrackerCore (= 3.5.0)
   - GrowingAPM (0.0.14):
     - GrowingAPM/Core (= 0.0.14)
     - GrowingAPM/CrashMonitor (= 0.0.14)
@@ -126,7 +121,7 @@ PODS:
   - LBXScan/Types (2.3)
   - LBXScan/UI (2.3):
     - LBXScan/Types (~> 2.2)
-  - Protobuf (3.23.2)
+  - Protobuf (3.24.3)
   - SDCycleScrollView (1.82):
     - SDWebImage (>= 5.0.0)
   - SDWebImage (5.16.0):
@@ -141,7 +136,6 @@ DEPENDENCIES:
   - GrowingAnalytics/Autotracker (from `./`)
   - GrowingAnalytics/Protobuf (from `./`)
   - GrowingAnalytics/Tracker (from `./`)
-  - GrowingAnalytics/V2Adapter (from `./`)
   - GrowingAPM
   - GrowingToolsKit (>= 1.1.3)
   - KIF
@@ -167,17 +161,17 @@ EXTERNAL SOURCES:
     :path: "./"
 
 SPEC CHECKSUMS:
-  GrowingAnalytics: e979ac80ec02c3aacf9f38a24bde276051a68017
-  GrowingAnalytics-cdp: 273939219903d141466237a703700cfb6bb0b689
+  GrowingAnalytics: 44561a024aa780a9b3d3dcd1c38401645fdf9885
+  GrowingAnalytics-cdp: 0c3605344c9870ac9982cb0315c498f7a12298c3
   GrowingAPM: 79fe4f4a12d94432fa4a552d56c41940ea13961a
   GrowingToolsKit: 88b144e858f8895f1d84c518642ce34ce0f5aa07
   GrowingUtils: 5212c5c0501ea0c3863a29c33ccefbde5be77353
   KIF: 7660c626b0f2d4562533590960db70a36d640558
   LBXScan: e51449f0832d1fe17da632af0d22adeb3cfa3543
-  Protobuf: 5df4e9d2abd535fb675c68d171f6bc87983d27a6
+  Protobuf: 970f7ee93a3a08e3cf64859b8efd95ee32b4f87f
   SDCycleScrollView: a0d74c3384caa72bdfc81470bdbc8c14b3e1fbcf
   SDWebImage: 2aea163b50bfcb569a2726b6a754c54a4506fcf6
 
-PODFILE CHECKSUM: fc5c80fc22ae81b125ae3f92eb789ab6b7054c16
+PODFILE CHECKSUM: 82c0924b772d0db457a4d610670c1ac33475aeae
 
 COCOAPODS: 1.12.1