chore: in-app messaging fixes and improvements (#342)

customerio · Oct 7, 2024 · 8d64ba5 · 8d64ba5
1 parent 8aeeddf
commit 8d64ba5
Show file tree

Hide file tree

Showing 21 changed files with 1,471 additions and 1,542 deletions.
diff --git a/Apps/APN/ios/Podfile b/Apps/APN/ios/Podfile
@@ -18,7 +18,9 @@ target 'SampleApp' do
   # Flags change depending on the env values.
   flags = get_default_flags()
 
-  pod 'customerio-reactnative/apn', :path => '../node_modules/customerio-reactnative'
+  # TODO: Remove this once iOS Native SDK is released and revert to original code
+  install_non_production_ios_sdk_git_branch(branch_name: 'feature/react-native-cdp', is_app_extension: false, push_service: "apn")
+  # pod 'customerio-reactnative/apn', :path => '../node_modules/customerio-reactnative'
   # install_non_production_ios_sdk_local_path(local_path: '~/code/customerio-ios/', is_app_extension: false, push_service: "apn")
   # install_non_production_ios_sdk_git_branch(branch_name: 'main', is_app_extension: false, push_service: "apn")
 
@@ -49,7 +51,9 @@ target 'SampleApp' do
 end
 
 target 'NotificationServiceExtension' do
-  pod 'customerio-reactnative-richpush/apn', :path => '../node_modules/customerio-reactnative'
+  # TODO: Remove this once iOS Native SDK is released and revert to original code
+  install_non_production_ios_sdk_git_branch(branch_name: 'feature/react-native-cdp', is_app_extension: true, push_service: "apn")
+  # pod 'customerio-reactnative-richpush/apn', :path => '../node_modules/customerio-reactnative'
   # install_non_production_ios_sdk_local_path(local_path: '~/code/customerio-ios/', is_app_extension: true, push_service: "apn")
   # install_non_production_ios_sdk_git_branch(branch_name: 'main', is_app_extension: true, push_service: "apn")
 end
diff --git a/Apps/APN/ios/Podfile.lock b/Apps/APN/ios/Podfile.lock
@@ -5,42 +5,33 @@ PODS:
   - boost (1.83.0)
   - customerio-reactnative (3.9.0):
     - customerio-reactnative/nopush (= 3.9.0)
-    - CustomerIO/DataPipelines (= 3.3.3)
-    - CustomerIO/MessagingInApp (= 3.3.3)
-    - React-Core
-  - customerio-reactnative-richpush/apn (3.9.0):
-    - CustomerIO/MessagingPushAPN (= 3.3.3)
-  - customerio-reactnative/apn (3.9.0):
-    - CustomerIO/DataPipelines (= 3.3.3)
-    - CustomerIO/MessagingInApp (= 3.3.3)
-    - CustomerIO/MessagingPushAPN (= 3.3.3)
+    - CustomerIO/DataPipelines (= 3.4.1)
+    - CustomerIO/MessagingInApp (= 3.4.1)
     - React-Core
   - customerio-reactnative/nopush (3.9.0):
-    - CustomerIO/DataPipelines (= 3.3.3)
-    - CustomerIO/MessagingInApp (= 3.3.3)
-    - CustomerIO/MessagingPush (= 3.3.3)
+    - CustomerIO/DataPipelines (= 3.4.1)
+    - CustomerIO/MessagingInApp (= 3.4.1)
+    - CustomerIO/MessagingPush (= 3.4.1)
     - React-Core
-  - CustomerIO/DataPipelines (3.3.3):
-    - CustomerIODataPipelines (= 3.3.3)
-  - CustomerIO/MessagingInApp (3.3.3):
-    - CustomerIOMessagingInApp (= 3.3.3)
-  - CustomerIO/MessagingPush (3.3.3):
-    - CustomerIOMessagingPush (= 3.3.3)
-  - CustomerIO/MessagingPushAPN (3.3.3):
-    - CustomerIOMessagingPushAPN (= 3.3.3)
-  - CustomerIOCommon (3.3.3)
-  - CustomerIODataPipelines (3.3.3):
+  - CustomerIO/DataPipelines (3.4.1):
+    - CustomerIODataPipelines (= 3.4.1)
+  - CustomerIO/MessagingInApp (3.4.1):
+    - CustomerIOMessagingInApp (= 3.4.1)
+  - CustomerIO/MessagingPush (3.4.1):
+    - CustomerIOMessagingPush (= 3.4.1)
+  - CustomerIOCommon (3.4.1)
+  - CustomerIODataPipelines (3.4.1):
     - "AnalyticsSwiftCIO (= 1.5.14+cio.1)"
-    - CustomerIOCommon (= 3.3.3)
-    - CustomerIOTrackingMigration (= 3.3.3)
-  - CustomerIOMessagingInApp (3.3.3):
-    - CustomerIOCommon (= 3.3.3)
-  - CustomerIOMessagingPush (3.3.3):
-    - CustomerIOCommon (= 3.3.3)
-  - CustomerIOMessagingPushAPN (3.3.3):
-    - CustomerIOMessagingPush (= 3.3.3)
-  - CustomerIOTrackingMigration (3.3.3):
-    - CustomerIOCommon (= 3.3.3)
+    - CustomerIOCommon (= 3.4.1)
+    - CustomerIOTrackingMigration (= 3.4.1)
+  - CustomerIOMessagingInApp (3.4.1):
+    - CustomerIOCommon (= 3.4.1)
+  - CustomerIOMessagingPush (3.4.1):
+    - CustomerIOCommon (= 3.4.1)
+  - CustomerIOMessagingPushAPN (3.4.1):
+    - CustomerIOMessagingPush (= 3.4.1)
+  - CustomerIOTrackingMigration (3.4.1):
+    - CustomerIOCommon (= 3.4.1)
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.73.6)
   - FBReactNativeSpec (0.73.6):
@@ -1125,8 +1116,11 @@ PODS:
 DEPENDENCIES:
   - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`)
   - customerio-reactnative (from `../node_modules/customerio-reactnative`)
-  - customerio-reactnative-richpush/apn (from `../node_modules/customerio-reactnative`)
-  - customerio-reactnative/apn (from `../node_modules/customerio-reactnative`)
+  - CustomerIOCommon (from `https://github.com/customerio/customerio-ios.git`, branch `feature/react-native-cdp`)
+  - CustomerIODataPipelines (from `https://github.com/customerio/customerio-ios.git`, branch `feature/react-native-cdp`)
+  - CustomerIOMessagingInApp (from `https://github.com/customerio/customerio-ios.git`, branch `feature/react-native-cdp`)
+  - CustomerIOMessagingPush (from `https://github.com/customerio/customerio-ios.git`, branch `feature/react-native-cdp`)
+  - CustomerIOMessagingPushAPN (from `https://github.com/customerio/customerio-ios.git`, branch `feature/react-native-cdp`)
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
   - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
@@ -1191,11 +1185,6 @@ SPEC REPOS:
   trunk:
     - AnalyticsSwiftCIO
     - CustomerIO
-    - CustomerIOCommon
-    - CustomerIODataPipelines
-    - CustomerIOMessagingInApp
-    - CustomerIOMessagingPush
-    - CustomerIOMessagingPushAPN
     - CustomerIOTrackingMigration
     - fmt
     - JSONSafeEncoding
@@ -1208,8 +1197,21 @@ EXTERNAL SOURCES:
     :podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec"
   customerio-reactnative:
     :path: "../node_modules/customerio-reactnative"
-  customerio-reactnative-richpush:
-    :path: "../node_modules/customerio-reactnative"
+  CustomerIOCommon:
+    :branch: feature/react-native-cdp
+    :git: https://github.com/customerio/customerio-ios.git
+  CustomerIODataPipelines:
+    :branch: feature/react-native-cdp
+    :git: https://github.com/customerio/customerio-ios.git
+  CustomerIOMessagingInApp:
+    :branch: feature/react-native-cdp
+    :git: https://github.com/customerio/customerio-ios.git
+  CustomerIOMessagingPush:
+    :branch: feature/react-native-cdp
+    :git: https://github.com/customerio/customerio-ios.git
+  CustomerIOMessagingPushAPN:
+    :branch: feature/react-native-cdp
+    :git: https://github.com/customerio/customerio-ios.git
   DoubleConversion:
     :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
   FBLazyVector:
@@ -1324,18 +1326,34 @@ EXTERNAL SOURCES:
   Yoga:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
+CHECKOUT OPTIONS:
+  CustomerIOCommon:
+    :commit: f5176708f3875388a901338490ff8d64a1a930ae
+    :git: https://github.com/customerio/customerio-ios.git
+  CustomerIODataPipelines:
+    :commit: f5176708f3875388a901338490ff8d64a1a930ae
+    :git: https://github.com/customerio/customerio-ios.git
+  CustomerIOMessagingInApp:
+    :commit: f5176708f3875388a901338490ff8d64a1a930ae
+    :git: https://github.com/customerio/customerio-ios.git
+  CustomerIOMessagingPush:
+    :commit: f5176708f3875388a901338490ff8d64a1a930ae
+    :git: https://github.com/customerio/customerio-ios.git
+  CustomerIOMessagingPushAPN:
+    :commit: f5176708f3875388a901338490ff8d64a1a930ae
+    :git: https://github.com/customerio/customerio-ios.git
+
 SPEC CHECKSUMS:
   AnalyticsSwiftCIO: d03712b33e85baecc86f0d38a6d53c97f7bc5bd1
   boost: d3f49c53809116a5d38da093a8aa78bf551aed09
-  CustomerIO: 31577d6ea64c13a03b1d62eec5687cbadeaa92b1
-  customerio-reactnative: d0335bff63ba7721a49d07827482acd86827300a
-  customerio-reactnative-richpush: 74632ed49c22819fb4409508ee3a8a8aa54bab56
-  CustomerIOCommon: bafcdc80e34dc40fb4cdf6e44d9bab851e6e127d
-  CustomerIODataPipelines: 5be26a9236a075407ad01cdbb2a80118df3b1462
-  CustomerIOMessagingInApp: eb41cccba6cb2b114673e2ea795ef20cb376c89f
-  CustomerIOMessagingPush: 4d3a603215d469ed6362e5c9905ba0e06a33b9d8
-  CustomerIOMessagingPushAPN: e55c37ec661c34cf3938981ee33777326dc8d406
-  CustomerIOTrackingMigration: 1fa4c2464868009cff2bba1c0fa3512ad51742a5
+  CustomerIO: 7563a4e69cc71940e45285b509074a0929132c46
+  customerio-reactnative: 8443cefc6cfbbcace089683bfc5d733dfe94874f
+  CustomerIOCommon: 4918263730b3e7349e9ab8fdd5d11ff577d44ae6
+  CustomerIODataPipelines: da9bee0a16b177b610078b72173615f2b1ddfa46
+  CustomerIOMessagingInApp: 3b12a3bb8b08cd426594d34cb3042ba187ac5141
+  CustomerIOMessagingPush: 0b270e12d1b1915d38d8627c97a9b176f2c80e8f
+  CustomerIOMessagingPushAPN: 64f0c6ee1f7385d4c7ef700b3e892d2cc0f655a5
+  CustomerIOTrackingMigration: 580086b225417687beb3106c5ac955c37b5507cd
   DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
   FBLazyVector: f64d1e2ea739b4d8f7e4740cde18089cd97fe864
   FBReactNativeSpec: 9f2b8b243131565335437dba74923a8d3015e780
@@ -1396,8 +1414,8 @@ SPEC CHECKSUMS:
   RNSnackbar: 37ce6daf19c8bd35cf6133db5797aa298c8782ac
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   Sovran: f8212bb3855042a24689a73ea0219ca5295235da
-  Yoga: d17d2cc8105eed528474683b42e2ea310e1daf61
+  Yoga: 805bf71192903b20fc14babe48080582fee65a80
 
-PODFILE CHECKSUM: 68f9a44facfa96472c7d4c19bacfda4a8d7d8507
+PODFILE CHECKSUM: f0db3d59efb5635626ea907f3b6a400ebe778048
 
 COCOAPODS: 1.15.2
diff --git a/Apps/APN/ios/SampleApp.xcodeproj/project.pbxproj b/Apps/APN/ios/SampleApp.xcodeproj/project.pbxproj
@@ -366,10 +366,14 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-NotificationServiceExtension/Pods-NotificationServiceExtension-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/AnalyticsSwiftCIO/Segment_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/CustomerIODataPipelines/CustomerIODataPipelines_Privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/CustomerIOMessagingPushAPN/CustomerIOMessagingPushAPN_Privacy.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Segment_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CustomerIODataPipelines_Privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CustomerIOMessagingPushAPN_Privacy.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;