chore: merge main into cdp (#338)

Co-authored-by: semantic-release-bot <[email protected]>
customerio · Oct 1, 2024 · 0797f8e · 0797f8e
1 parent 129d4d2
commit 0797f8e
Show file tree

Hide file tree

Showing 11 changed files with 9,488 additions and 10,575 deletions.
diff --git a/Apps/APN/android/app/src/main/java/io/customer/ami/MainActivity.kt b/Apps/APN/android/app/src/main/java/io/customer/ami/MainActivity.kt
@@ -1,8 +1,9 @@
 package io.customer.ami;
-import com.facebook.react.ReactActivity;
-import com.facebook.react.ReactActivityDelegate;
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled;
-import com.facebook.react.defaults.DefaultReactActivityDelegate;
+
+import com.facebook.react.ReactActivity
+import com.facebook.react.ReactActivityDelegate
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
+import com.facebook.react.defaults.DefaultReactActivityDelegate
 
 class MainActivity : ReactActivity() {
 

diff --git a/Apps/APN/android/app/src/main/java/io/customer/ami/MainApplication.kt b/Apps/APN/android/app/src/main/java/io/customer/ami/MainApplication.kt
@@ -1,15 +1,16 @@
 package io.customer.ami;
-import android.app.Application;
-import com.facebook.react.PackageList;
-import com.facebook.react.ReactApplication;
-import com.facebook.react.ReactHost;
-import com.facebook.react.ReactNativeHost;
-import com.facebook.react.ReactPackage;
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load;
-import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost;
-import com.facebook.react.defaults.DefaultReactNativeHost;
-import com.facebook.react.flipper.ReactNativeFlipper;
-import com.facebook.soloader.SoLoader;
+
+import android.app.Application
+import com.facebook.react.PackageList
+import com.facebook.react.ReactApplication
+import com.facebook.react.ReactHost
+import com.facebook.react.ReactNativeHost
+import com.facebook.react.ReactPackage
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
+import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
+import com.facebook.react.defaults.DefaultReactNativeHost
+import com.facebook.react.flipper.ReactNativeFlipper
+import com.facebook.soloader.SoLoader
 
 class MainApplication : Application(), ReactApplication {
 

diff --git a/Apps/APN/ios/Podfile.lock b/Apps/APN/ios/Podfile.lock
@@ -3,19 +3,19 @@ PODS:
     - JSONSafeEncoding (= 2.0.0)
     - Sovran (= 1.1.1)
   - boost (1.83.0)
-  - customerio-reactnative (3.8.0):
-    - customerio-reactnative/nopush (= 3.8.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.8.0):
+  - customerio-reactnative-richpush/apn (3.9.0):
     - CustomerIO/MessagingPushAPN (= 3.3.3)
-  - customerio-reactnative/apn (3.8.0):
+  - customerio-reactnative/apn (3.9.0):
     - CustomerIO/DataPipelines (= 3.3.3)
     - CustomerIO/MessagingInApp (= 3.3.3)
     - CustomerIO/MessagingPushAPN (= 3.3.3)
     - React-Core
-  - customerio-reactnative/nopush (3.8.0):
+  - customerio-reactnative/nopush (3.9.0):
     - CustomerIO/DataPipelines (= 3.3.3)
     - CustomerIO/MessagingInApp (= 3.3.3)
     - CustomerIO/MessagingPush (= 3.3.3)
@@ -930,7 +930,7 @@ PODS:
     - React-debug
   - react-native-notifications (5.1.0):
     - React-Core
-  - react-native-safe-area-context (4.10.9):
+  - react-native-safe-area-context (4.11.0):
     - React-Core
   - React-nativeconfig (0.73.6)
   - React-NativeModulesApple (0.73.6):
@@ -1101,13 +1101,13 @@ PODS:
     - React-perflogger (= 0.73.6)
   - RNCAsyncStorage (1.24.0):
     - React-Core
-  - RNCClipboard (1.14.1):
+  - RNCClipboard (1.14.2):
     - React-Core
   - RNCPushNotificationIOS (1.11.0):
     - React-Core
   - RNDeviceInfo (10.14.0):
     - React-Core
-  - RNGestureHandler (2.18.1):
+  - RNGestureHandler (2.20.0):
     - glog
     - RCT-Folly (= 2022.05.16.00)
     - React-Core
@@ -1116,7 +1116,7 @@ PODS:
     - RCT-Folly (= 2022.05.16.00)
     - React-Core
     - React-RCTImage
-  - RNSnackbar (2.6.2):
+  - RNSnackbar (2.8.0):
     - React-Core
   - SocketRocket (0.6.1)
   - Sovran (1.1.1)
@@ -1328,8 +1328,8 @@ SPEC CHECKSUMS:
   AnalyticsSwiftCIO: d03712b33e85baecc86f0d38a6d53c97f7bc5bd1
   boost: d3f49c53809116a5d38da093a8aa78bf551aed09
   CustomerIO: 31577d6ea64c13a03b1d62eec5687cbadeaa92b1
-  customerio-reactnative: 0a5b2814d0edaa2a1de62d9af68111fe8b0581a0
-  customerio-reactnative-richpush: 2aa8f7c5fc767bf64035a48defcea3cbef1bb107
+  customerio-reactnative: d0335bff63ba7721a49d07827482acd86827300a
+  customerio-reactnative-richpush: 74632ed49c22819fb4409508ee3a8a8aa54bab56
   CustomerIOCommon: bafcdc80e34dc40fb4cdf6e44d9bab851e6e127d
   CustomerIODataPipelines: 5be26a9236a075407ad01cdbb2a80118df3b1462
   CustomerIOMessagingInApp: eb41cccba6cb2b114673e2ea795ef20cb376c89f
@@ -1366,7 +1366,7 @@ SPEC CHECKSUMS:
   React-logger: 3eb80a977f0d9669468ef641a5e1fabbc50a09ec
   React-Mapbuffer: 84ea43c6c6232049135b1550b8c60b2faac19fab
   react-native-notifications: 4601a5a8db4ced6ae7cfc43b44d35fe437ac50c4
-  react-native-safe-area-context: ab8f4a3d8180913bd78ae75dd599c94cce3d5e9a
+  react-native-safe-area-context: 851c62c48dce80ccaa5637b6aa5991a1bc36eca9
   React-nativeconfig: b4d4e9901d4cabb57be63053fd2aa6086eb3c85f
   React-NativeModulesApple: cd26e56d56350e123da0c1e3e4c76cb58a05e1ee
   React-perflogger: 5f49905de275bac07ac7ea7f575a70611fa988f2
@@ -1388,15 +1388,15 @@ SPEC CHECKSUMS:
   React-utils: d16c1d2251c088ad817996621947d0ac8167b46c
   ReactCommon: 2aa35648354bd4c4665b9a5084a7d37097b89c10
   RNCAsyncStorage: ec53e44dc3e75b44aa2a9f37618a49c3bc080a7a
-  RNCClipboard: 0a720adef5ec193aa0e3de24c3977222c7e52a37
+  RNCClipboard: 5e503962f0719ace8f7fdfe9c60282b526305c85
   RNCPushNotificationIOS: 64218f3c776c03d7408284a819b2abfda1834bc8
   RNDeviceInfo: 59344c19152c4b2b32283005f9737c5c64b42fba
-  RNGestureHandler: 1155b1898ceddefeebf77792927360d44fe11e77
+  RNGestureHandler: bb81850add626ddd265294323310fec6e861c96b
   RNScreens: 29418ceffb585b8f0ebd363de304288c3dce8323
-  RNSnackbar: 3727b42bf6c4314a53c18185b5203e915a4ab020
+  RNSnackbar: 37ce6daf19c8bd35cf6133db5797aa298c8782ac
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   Sovran: f8212bb3855042a24689a73ea0219ca5295235da
-  Yoga: d17d2cc8105eed528474683b42e2ea310e1daf61
+  Yoga: 805bf71192903b20fc14babe48080582fee65a80
 
 PODFILE CHECKSUM: 68f9a44facfa96472c7d4c19bacfda4a8d7d8507
 

diff --git a/Apps/APN/ios/SampleApp.xcodeproj/project.pbxproj b/Apps/APN/ios/SampleApp.xcodeproj/project.pbxproj
@@ -17,8 +17,7 @@
 		46D41EE02A0944BF0008DBA4 /* NotificationServiceExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 46D41ED82A0944BF0008DBA4 /* NotificationServiceExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		46D41EE52A0944D60008DBA4 /* NotificationServicePushHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 46D41EE42A0944D60008DBA4 /* NotificationServicePushHandler.swift */; };
 		46F118D6296C3764007E1D09 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 46FB06302965B4EC00001290 /* main.m */; };
-		94F0DA212CA4364D0032DC6A /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 94F0DA202CA4364D0032DC6A /* GoogleService-Info.plist */; };
-		A71D88C22C6E38FE005A6C43 /* (null) in Resources */ = {isa = PBXBuildFile; };
+		A71D88C22C6E38FE005A6C43 /* BuildFile in Resources */ = {isa = PBXBuildFile; };
 		A741D6A62A69215E00E1F1E6 /* Env.swift in Sources */ = {isa = PBXBuildFile; fileRef = A741D6A52A69215E00E1F1E6 /* Env.swift */; };
 		A741D6A72A69215E00E1F1E6 /* Env.swift in Sources */ = {isa = PBXBuildFile; fileRef = A741D6A52A69215E00E1F1E6 /* Env.swift */; };
 		BB2F792D24A3F905000567C9 /* Expo.plist in Resources */ = {isa = PBXBuildFile; fileRef = BB2F792C24A3F905000567C9 /* Expo.plist */; };
@@ -249,7 +248,7 @@
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 				4632B4CF283E5CB800AF05BC /* Embed App Extensions */,
 				9C9433299D4E03BE0A110713 /* [CP] Copy Pods Resources */,
-				6E7A46CFCAA64197A403F1B9 /* [CP] Embed Pods Frameworks */,
+				9EDB18CE87F637967BC2869A /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -326,12 +325,11 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A71D88C22C6E38FE005A6C43 /* (null) in Resources */,
+				A71D88C22C6E38FE005A6C43 /* BuildFile in Resources */,
 				BB2F792D24A3F905000567C9 /* Expo.plist in Resources */,
 				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
 				13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */,
 				3E461D99554A48A4959DE609 /* SplashScreen.storyboard in Resources */,
-				94F0DA212CA4364D0032DC6A /* GoogleService-Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -377,24 +375,6 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-NotificationServiceExtension/Pods-NotificationServiceExtension-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		6E7A46CFCAA64197A403F1B9 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-SampleApp/Pods-SampleApp-frameworks.sh",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-SampleApp/Pods-SampleApp-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		84DBEFE97EA63AF5245F33E8 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -447,6 +427,24 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-SampleApp/Pods-SampleApp-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+		9EDB18CE87F637967BC2869A /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-SampleApp/Pods-SampleApp-frameworks.sh",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-SampleApp/Pods-SampleApp-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		BDAAB9BC2289B6D899246938 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -844,7 +842,10 @@
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
-				OTHER_LDFLAGS = "$(inherited)  ";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					" ",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;
@@ -898,7 +899,10 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_CPLUSPLUSFLAGS = "$(inherited)";
-				OTHER_LDFLAGS = "$(inherited)  ";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					" ",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;