Merge branch 'main' into rosie/android-expo-push-kotlin-generation

Author: Rosie-Kennelly-1

android/build.gradle

@@ -84,6 +84,6 @@ dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"  // From node_modules
   implementation "com.google.firebase:firebase-messaging:24.1.2"
-  implementation 'io.intercom.android:intercom-sdk:17.4.5'
-  implementation 'io.intercom.android:intercom-sdk-ui:17.4.5'
+  implementation 'io.intercom.android:intercom-sdk:17.4.6'
+  implementation 'io.intercom.android:intercom-sdk-ui:17.4.6'
 }

examples/example/ios/Podfile.lock

@@ -4,11 +4,11 @@ PODS:
   - FBLazyVector (0.74.0)
   - fmt (9.1.0)
   - glog (0.3.5)
-  - Intercom (19.5.2)
-  - intercom-react-native (9.6.2):
+  - Intercom (19.5.3)
+  - intercom-react-native (9.6.4):
     - DoubleConversion
     - glog
-    - Intercom (~> 19.5.2)
+    - Intercom (~> 19.5.3)
     - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
@@ -1332,8 +1332,8 @@ SPEC CHECKSUMS:
   FBLazyVector: 026c8f4ae67b06e088ae01baa2271ef8a26c0e8c
   fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120
   glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
-  Intercom: 67b84e19b6db623c48fb10c1f30d82deac4cbc4d
-  intercom-react-native: d67de7981f4bbb165329d6ba64da607b9092f241
+  Intercom: 46e995a707671f473928d57f7c79609a88984cf7
+  intercom-react-native: 7586ad0f8aa26a25689682e907a0ff49c142bb21
   RCT-Folly: 045d6ecaa59d826c5736dfba0b2f4083ff8d79df
   RCTDeprecation: 3ca8b6c36bfb302e1895b72cfe7db0de0c92cd47
   RCTRequired: 9fc183af555fd0c89a366c34c1ae70b7e03b1dc5

examples/expo-example/metro.config.js

@@ -1,7 +1,15 @@
+const path = require('path');
 const { getDefaultConfig } = require('expo/metro-config');
 const { withNativeWind } = require('nativewind/metro');
 
+const libraryRoot = path.resolve(__dirname, '..', '..');
+
 const config = getDefaultConfig(__dirname);
 config.resolver.unstable_enableSymlinks = true;
+config.watchFolders = [libraryRoot];
+config.resolver.nodeModulesPaths = [path.resolve(__dirname, 'node_modules')];
+config.resolver.blockList = [
+  new RegExp(path.resolve(libraryRoot, 'node_modules') + '/.*'),
+];
 
 module.exports = withNativeWind(config, { input: './global.css' });

examples/expo-example/pnpm-lock.yaml

@@ -8,15 +8,15 @@ PODS:
   - hermes-engine (0.81.1):
     - hermes-engine/Pre-built (= 0.81.1)
   - hermes-engine/Pre-built (0.81.1)
-  - Intercom (19.5.2)
-  - intercom-react-native (9.6.2):
+  - Intercom (19.5.3)
+  - intercom-react-native (9.6.4):
     - boost
     - DoubleConversion
     - fast_float
     - fmt
     - glog
     - hermes-engine
-    - Intercom (~> 19.5.2)
+    - Intercom (~> 19.5.3)
     - RCT-Folly
     - RCT-Folly/Fabric
     - RCTRequired
@@ -2773,8 +2773,8 @@ SPEC CHECKSUMS:
   fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
   glog: 5683914934d5b6e4240e497e0f4a3b42d1854183
   hermes-engine: 4f8246b1f6d79f625e0d99472d1f3a71da4d28ca
-  Intercom: 67b84e19b6db623c48fb10c1f30d82deac4cbc4d
-  intercom-react-native: a8610843ee924de520b5d7cf58ba8e7e477a2bef
+  Intercom: 46e995a707671f473928d57f7c79609a88984cf7
+  intercom-react-native: f272f8730e1d603cef69454b495158ad6c6516ea
   MMKV: 7b5df6a8bf785c6705cc490c541b9d8a957c4a64
   MMKVCore: 3f40b896e9ab522452df9df3ce983471aa2449ba
   RCT-Folly: 59ec0ac1f2f39672a0c6e6cecdd39383b764646f

examples/with-notifications/ios/Podfile.lock

@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
 
   s.pod_target_xcconfig = { "DEFINES_MODULE" => "YES" }
 
-  s.dependency "Intercom", '~> 19.5.2'
+  s.dependency "Intercom", '~> 19.5.3'
 
   is_new_arch_enabled = ENV["RCT_NEW_ARCH_ENABLED"] == "1"
   folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'

intercom-react-native.podspec

@@ -1,6 +1,6 @@
 {
   "name": "@intercom/intercom-react-native",
-  "version": "9.6.3",
+  "version": "9.6.4",
   "description": "React Native wrapper to bridge our iOS and Android SDK",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",

package.json

@@ -59,7 +59,7 @@ export const withIntercomPushNotification: ConfigPlugin<IntercomPluginProps> = (
   props
 ) => {
   let newConfig = config;
-  newConfig = appDelegate(config, props);
-  newConfig = infoPlist(config, props);
+  newConfig = appDelegate(newConfig, props);
+  newConfig = infoPlist(newConfig, props);
   return newConfig;
 };

src/expo-plugins/withPushNotifications.ts

@@ -14360,15 +14360,15 @@ __metadata:
   linkType: hard
 
 "tar@npm:^7.4.3":
-  version: 7.5.9
-  resolution: "tar@npm:7.5.9"
+  version: 7.5.11
+  resolution: "tar@npm:7.5.11"
   dependencies:
     "@isaacs/fs-minipass": ^4.0.0
     chownr: ^3.0.0
     minipass: ^7.1.2
     minizlib: ^3.1.0
     yallist: ^5.0.0
-  checksum: 26fbbdf536895814167d03e4883f80febb6520729169c54d0f29ee8a163557283862752493f0e5b60800a6f3608aac3250c41fac8e20a4f056ba4fa63f3dbad7
+  checksum: 7f6785a85dd571b88985e493ec86f692962cbfa7b4017961fddfd2241e0ff3bcd89ed347f4c02b5433aa22b30cca5566e8711543df054fda8fd12425f505378f
   languageName: node
   linkType: hard