Skip to content

Commit 8bed8c3

Browse files
Br1an-BoyleBr1an-Boyle
authored
Merge branch 'main' into main
2 parents 8dd6e67 + 0b2401d commit 8bed8c3

File tree

13 files changed

+2178
-3770
lines changed

13 files changed

+2178
-3770
lines changed

‎.circleci/config.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ version: 2.1
44
macos_config: &macos_config
55
macos:
66
xcode: 12.5.0
7+
resource_class: macos.x86.medium.gen2
78
shell: /bin/bash --login -eo pipefail
89

910
setup_env_file: &setup_env_file
@@ -21,10 +22,13 @@ executors:
2122
orbs:
2223
android: circleci/[email protected]
2324

24-
run_on_master: &run_on_master
25+
26+
run_on_release: &run_on_release
2527
filters:
28+
tags:
29+
only: /.*/
2630
branches:
27-
only: main
31+
ignore: /.*/
2832

2933
commands:
3034
attach_project:
@@ -254,7 +258,7 @@ workflows:
254258
- unit-tests
255259
- build-package
256260
- release-to-npm:
257-
<<: *run_on_master
261+
<<: *run_on_release
258262
context:
259263
- react-native-context
260264
requires:

‎example/e2e/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616
"@wdio/cli": "^7.7.2",
1717
"appium": "^1.21.0",
1818
"chai": "^4.3.4",
19+
"webdriver": "^7.16.13",
1920
"webdriverio": "^7.7.2"
2021
},
2122
"devDependencies": {
22-
"@wdio/appium-service": "^7.7.3",
23+
"@wdio/appium-service": "^7.16.13",
2324
"@wdio/local-runner": "^7.7.3",
2425
"@wdio/mocha-framework": "^7.7.3",
2526
"@wdio/spec-reporter": "^7.7.3",

‎example/e2e/tests/mainIntercom.e2e.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ describe('Intercom E2E', () => {
9595

9696
const launcherId = driver.isAndroid
9797
? '~Intercom launcher'
98-
: '~launcher';
98+
: '~intercom launcher';
9999
await (await $(launcherId)).waitForDisplayed({ timeout: 12000 });
100100
await driver.clickWithDelay('~toggle-launcher-visibility', 12000);
101101
});

‎example/e2e/yarn.lock‎

Lines changed: 79 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -792,6 +792,11 @@
792792
resolved "https://registry.npmjs.org/@types/node/-/node-14.17.3.tgz"
793793
integrity sha512-e6ZowgGJmTuXa3GyaPbTGxX17tnThl2aSSizrFthQ7m9uLGZBXiGhgE55cjRZTF5kjZvYn9EOPOMljdjwbflxw==
794794

795+
"@types/node@^17.0.4":
796+
version "17.0.8"
797+
resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.8.tgz#50d680c8a8a78fe30abe6906453b21ad8ab0ad7b"
798+
integrity sha512-YofkM6fGv4gDJq78g4j0mMuGMkZVxZDgtU0JRdx6FgiJDG+0fY0GKVolOV8WqVmEhLCXkQRjwDdKyPxJp/uucg==
799+
795800
"@types/puppeteer-core@^5.4.0":
796801
version "5.4.0"
797802
resolved "https://registry.npmjs.org/@types/puppeteer-core/-/puppeteer-core-5.4.0.tgz"
@@ -883,15 +888,15 @@
883888
resolved "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz"
884889
integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
885890

886-
"@wdio/appium-service@^7.7.3":
887-
version "7.7.3"
888-
resolved "https://registry.npmjs.org/@wdio/appium-service/-/appium-service-7.7.3.tgz"
889-
integrity sha512-cbP+ggxADHWdjtI0jSWlOVoLJYpiUgMU31ukOCmOqioepgmCzXTGSlyPoA8K7A3LGYLKn6U/XKXs4OggnVJLOA==
891+
"@wdio/appium-service@^7.16.13":
892+
version "7.16.13"
893+
resolved "https://registry.yarnpkg.com/@wdio/appium-service/-/appium-service-7.16.13.tgz#1b2a1ca7460ba477dd7545d9cc220cd394443324"
894+
integrity sha512-hb2Avr2g4wWZOthz1SMOcneZQGrbFfgksHNQwLub2lyvTpW7VGDb54nHj7IyPN4bFz/FUlea64ptiJFO5LIMNg==
890895
dependencies:
891896
"@types/fs-extra" "^9.0.4"
892-
"@wdio/config" "7.7.3"
893-
"@wdio/logger" "7.7.0"
894-
"@wdio/types" "7.7.3"
897+
"@wdio/config" "7.16.13"
898+
"@wdio/logger" "7.16.0"
899+
"@wdio/types" "7.16.13"
895900
fs-extra "^10.0.0"
896901
param-case "^3.0.0"
897902

@@ -945,6 +950,16 @@
945950
deepmerge "^4.0.0"
946951
glob "^7.1.2"
947952

953+
"@wdio/[email protected]":
954+
version "7.16.13"
955+
resolved "https://registry.yarnpkg.com/@wdio/config/-/config-7.16.13.tgz#fcc316e33fe28886ee641282bbae8cae70871c90"
956+
integrity sha512-LSGoa83tWQIBppB+LeHjY40B9tuuvmDV1qdBLVXR1ROcOUWWz/oQP3NFLtLm3266LXoJUbwebzGcRIK1EcNk3Q==
957+
dependencies:
958+
"@wdio/logger" "7.16.0"
959+
"@wdio/types" "7.16.13"
960+
deepmerge "^4.0.0"
961+
glob "^7.1.2"
962+
948963
"@wdio/[email protected]":
949964
version "7.7.3"
950965
resolved "https://registry.npmjs.org/@wdio/config/-/config-7.7.3.tgz"
@@ -989,6 +1004,16 @@
9891004
loglevel-plugin-prefix "^0.8.4"
9901005
strip-ansi "^6.0.0"
9911006

1007+
"@wdio/[email protected]":
1008+
version "7.16.0"
1009+
resolved "https://registry.yarnpkg.com/@wdio/logger/-/logger-7.16.0.tgz#40f116ebffc23c638b8e421e350f110a058523e9"
1010+
integrity sha512-/6lOGb2Iow5eSsy7RJOl1kCwsP4eMlG+/QKro5zUJsuyNJSQXf2ejhpkzyKWLgQbHu83WX6cM1014AZuLkzoQg==
1011+
dependencies:
1012+
chalk "^4.0.0"
1013+
loglevel "^1.6.0"
1014+
loglevel-plugin-prefix "^0.8.4"
1015+
strip-ansi "^6.0.0"
1016+
9921017
"@wdio/[email protected]", "@wdio/logger@^7.5.3":
9931018
version "7.7.0"
9941019
resolved "https://registry.npmjs.org/@wdio/logger/-/logger-7.7.0.tgz"
@@ -1021,6 +1046,11 @@
10211046
resolved "https://registry.npmjs.org/@wdio/protocols/-/protocols-6.12.0.tgz"
10221047
integrity sha512-UhTBZxClCsM3VjaiDp4DoSCnsa7D1QNmI2kqEBfIpyNkT3GcZhJb7L+nL0fTkzCwi7+/uLastb3/aOwH99gt0A==
10231048

1049+
"@wdio/[email protected]":
1050+
version "7.16.7"
1051+
resolved "https://registry.yarnpkg.com/@wdio/protocols/-/protocols-7.16.7.tgz#8a160d59f0c028ff2dda6a1599a86a801a79bcb8"
1052+
integrity sha512-Wv40pNQcLiPzQ3o98Mv4A8T1EBQ6k4khglz/e2r16CTm+F3DDYh8eLMAsU5cgnmuwwDKX1EyOiFwieykBn5MCg==
1053+
10241054
"@wdio/[email protected]":
10251055
version "7.5.3"
10261056
resolved "https://registry.npmjs.org/@wdio/protocols/-/protocols-7.5.3.tgz"
@@ -1082,6 +1112,14 @@
10821112
easy-table "^1.1.1"
10831113
pretty-ms "^7.0.0"
10841114

1115+
"@wdio/[email protected]":
1116+
version "7.16.13"
1117+
resolved "https://registry.yarnpkg.com/@wdio/types/-/types-7.16.13.tgz#91e675cc2ba8f0da45f49d4630a143fa69792cc8"
1118+
integrity sha512-HIeXKCL+mUjyJxvnHSoaIo3NRgZLbeekyRIwo6USfd9qGlQ8dQ6fyCR3ZU9VqNz9j4+JIn+LRQ7imbz5SdnGbw==
1119+
dependencies:
1120+
"@types/node" "^17.0.4"
1121+
got "^11.8.1"
1122+
10851123
"@wdio/[email protected]":
10861124
version "7.7.3"
10871125
resolved "https://registry.npmjs.org/@wdio/types/-/types-7.7.3.tgz"
@@ -1105,6 +1143,15 @@
11051143
dependencies:
11061144
"@wdio/logger" "6.10.10"
11071145

1146+
"@wdio/[email protected]":
1147+
version "7.16.13"
1148+
resolved "https://registry.yarnpkg.com/@wdio/utils/-/utils-7.16.13.tgz#49bc88857900dd3543d15bef3d5c422669325212"
1149+
integrity sha512-O6D89Ghtm5XtTv4DPKvCBKZOZYNONIcBM5/hmdr3V9mzVrTFq8Q3uE8pmmq303Oh91KcoN8Em5zoAG7Zpc5tRg==
1150+
dependencies:
1151+
"@wdio/logger" "7.16.0"
1152+
"@wdio/types" "7.16.13"
1153+
p-iteration "^1.1.8"
1154+
11081155
"@wdio/[email protected]":
11091156
version "7.7.3"
11101157
resolved "https://registry.npmjs.org/@wdio/utils/-/utils-7.7.3.tgz"
@@ -4132,6 +4179,11 @@ kuler@^2.0.0:
41324179
resolved "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz"
41334180
integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==
41344181

4182+
ky@^0.28.5:
4183+
version "0.28.7"
4184+
resolved "https://registry.yarnpkg.com/ky/-/ky-0.28.7.tgz#10c42be863fb96c1846d6e71e229263ffb72eb15"
4185+
integrity sha512-a23i6qSr/ep15vdtw/zyEQIDLoUaKDg9Jf04CYl/0ns/wXNYna26zJpI+MeIFaPeDvkrjLPrKtKOiiI3IE53RQ==
4186+
41354187
lazystream@^1.0.0:
41364188
version "1.0.0"
41374189
resolved "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz"
@@ -4797,6 +4849,11 @@ p-is-promise@^2.0.0:
47974849
resolved "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz"
47984850
integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
47994851

4852+
p-iteration@^1.1.8:
4853+
version "1.1.8"
4854+
resolved "https://registry.yarnpkg.com/p-iteration/-/p-iteration-1.1.8.tgz#14df726d55af368beba81bcc92a26bb1b48e714a"
4855+
integrity sha512-IMFBSDIYcPNnW7uWYGrBqmvTiq7W0uB0fJn6shQZs7dlF3OvrHOre+JT9ikSZ7gZS3vWqclVgoQSvToJrns7uQ==
4856+
48004857
p-limit@^2.0.0, p-limit@^2.2.0:
48014858
version "2.3.0"
48024859
resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"
@@ -6244,6 +6301,21 @@ [email protected]:
62446301
got "^11.0.2"
62456302
lodash.merge "^4.6.1"
62466303

6304+
webdriver@^7.16.13:
6305+
version "7.16.13"
6306+
resolved "https://registry.yarnpkg.com/webdriver/-/webdriver-7.16.13.tgz#1e145062efe6525aabd0f1850b7b457c7d815985"
6307+
integrity sha512-Vfr952W1uIgDeWHPGzqH43dYLeRSZshh3TzA9ICUkvnC+Q7YziQdv/8xI8tuuyvb7lSr3VsuB2cGzyCRoC/NWw==
6308+
dependencies:
6309+
"@types/node" "^17.0.4"
6310+
"@wdio/config" "7.16.13"
6311+
"@wdio/logger" "7.16.0"
6312+
"@wdio/protocols" "7.16.7"
6313+
"@wdio/types" "7.16.13"
6314+
"@wdio/utils" "7.16.13"
6315+
got "^11.0.2"
6316+
ky "^0.28.5"
6317+
lodash.merge "^4.6.1"
6318+
62476319
[email protected], webdriverio@^7.7.2:
62486320
version "7.7.3"
62496321
resolved "https://registry.npmjs.org/webdriverio/-/webdriverio-7.7.3.tgz"

‎example/ios/IntercomReactNativeExample.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@
621621
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
622622
GCC_WARN_UNUSED_FUNCTION = YES;
623623
GCC_WARN_UNUSED_VARIABLE = YES;
624-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
624+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
625625
LD_RUNPATH_SEARCH_PATHS = (
626626
/usr/lib/swift,
627627
"$(inherited)",
@@ -679,7 +679,7 @@
679679
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
680680
GCC_WARN_UNUSED_FUNCTION = YES;
681681
GCC_WARN_UNUSED_VARIABLE = YES;
682-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
682+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
683683
LD_RUNPATH_SEARCH_PATHS = (
684684
/usr/lib/swift,
685685
"$(inherited)",

‎example/ios/Podfile‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
require_relative '../node_modules/react-native/scripts/react_native_pods'
22
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
33

4-
platform :ios, '11.0'
4+
platform :ios, '13.0'
55

66
target 'IntercomReactNativeExample' do
77
config = use_native_modules!
@@ -38,7 +38,11 @@ target 'IntercomReactNativeExample' do
3838
# I'm not aware of any other way to fix this one other than bumping iOS deployment target to match react-native (iOS 11 now)
3939
installer.pods_project.targets.each do |target|
4040
target.build_configurations.each do |config|
41-
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
41+
# Setting deployment target to iOS 11 for RCT-Folly to avoid errors with Flipper.
42+
if ['RCT-Folly'].include? target.name
43+
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
44+
end
45+
config.build_settings['GCC_WARN_INHIBIT_ALL_WARNINGS'] = 'YES'
4246
end
4347
end
4448

‎example/ios/Podfile.lock‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ PODS:
7272
- FlipperKit/FlipperKitNetworkPlugin
7373
- fmt (6.2.1)
7474
- glog (0.3.5)
75-
- Intercom (10.3.0)
76-
- intercom-react-native (1.1.0):
77-
- Intercom (~> 10.3.0)
75+
- Intercom (11.0.1)
76+
- intercom-react-native (2.0.1):
77+
- Intercom (~> 11.0.0)
7878
- React-Core
7979
- libevent (2.1.12)
8080
- OpenSSL-Universal (1.1.180)
@@ -273,9 +273,9 @@ PODS:
273273
- React-jsi (= 0.65.1)
274274
- React-perflogger (= 0.65.1)
275275
- React-jsinspector (0.65.1)
276-
- react-native-config (1.4.4):
277-
- react-native-config/App (= 1.4.4)
278-
- react-native-config/App (1.4.4):
276+
- react-native-config (1.4.5):
277+
- react-native-config/App (= 1.4.5)
278+
- react-native-config/App (1.4.5):
279279
- React-Core
280280
- React-perflogger (0.65.1)
281281
- React-RCTActionSheet (0.65.1):
@@ -341,7 +341,7 @@ PODS:
341341
- React-cxxreact (= 0.65.1)
342342
- React-jsi (= 0.65.1)
343343
- React-perflogger (= 0.65.1)
344-
- RNCAsyncStorage (1.15.7):
344+
- RNCAsyncStorage (1.15.14):
345345
- React-Core
346346
- Yoga (1.14.0)
347347
- YogaKit (1.18.1):
@@ -404,8 +404,6 @@ DEPENDENCIES:
404404
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
405405

406406
SPEC REPOS:
407-
https://cdn.cocoapods.org/:
408-
- Intercom
409407
trunk:
410408
- boost-for-react-native
411409
- CocoaAsyncSocket
@@ -419,6 +417,7 @@ SPEC REPOS:
419417
- Flipper-RSocket
420418
- FlipperKit
421419
- fmt
420+
- Intercom
422421
- libevent
423422
- OpenSSL-Universal
424423
- YogaKit
@@ -490,7 +489,7 @@ EXTERNAL SOURCES:
490489
SPEC CHECKSUMS:
491490
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
492491
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
493-
DoubleConversion: cde416483dac037923206447da6e1454df403714
492+
DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
494493
FBLazyVector: 33c82491102f20ecddb6c6a2c273696ace3191e0
495494
FBReactNativeSpec: df8f81d2a7541ee6755a047b398a5cb5a72acd0e
496495
Flipper: b1fddf9a17c32097b2b4c806ad158b2f36bb2692
@@ -503,9 +502,9 @@ SPEC CHECKSUMS:
503502
Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
504503
FlipperKit: aec2d931adeee48a07bab1ea8bcc8a6bb87dfce4
505504
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
506-
glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
507-
Intercom: b697b5972ca0fad3412a13c67c6920eab301498b
508-
intercom-react-native: 1d1eab12e134bb23fb2fdad6adc45a2196575091
505+
glog: 5337263514dd6f09803962437687240c5dc39aa4
506+
Intercom: ce64b3b0be34bb3f24527f2554a37b86f3d54363
507+
intercom-react-native: dfb9c1556eff6cfdc262bf9e148ee59804371632
509508
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
510509
OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
511510
RCT-Folly: 0dd9e1eb86348ecab5ba76f910b56f4b5fef3c46
@@ -519,7 +518,7 @@ SPEC CHECKSUMS:
519518
React-jsi: 12913c841713a15f64eabf5c9ad98592c0ec5940
520519
React-jsiexecutor: 43f2542aed3c26e42175b339f8d37fe3dd683765
521520
React-jsinspector: 41e58e5b8e3e0bf061fdf725b03f2144014a8fb0
522-
react-native-config: 72d948053a442779b3178fddd571e37f118ef606
521+
react-native-config: 6502b1879f97ed5ac570a029961fc35ea606cd14
523522
React-perflogger: fd28ee1f2b5b150b00043f0301d96bd417fdc339
524523
React-RCTActionSheet: 7f3fa0855c346aa5d7c60f9ced16e067db6d29fa
525524
React-RCTAnimation: 2119a18ee26159004b001bc56404ca5dbaae6077
@@ -532,10 +531,10 @@ SPEC CHECKSUMS:
532531
React-RCTVibration: 92d41c2442e5328cc4d342cd7f78e5876b68bae5
533532
React-runtimeexecutor: 85187f19dd9c47a7c102f9994f9d14e4dc2110de
534533
ReactCommon: eafed38eec7b591c31751bfa7494801618460459
535-
RNCAsyncStorage: 7102fe8985f889579a3ae148d957bbb3f308122b
534+
RNCAsyncStorage: ea6b5c280997b2b32a587793163b1f10e580c4f7
536535
Yoga: aa0cb45287ebe1004c02a13f279c55a95f1572f4
537536
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
538537

539-
PODFILE CHECKSUM: cfb09338b4af4ccfde99284137920d02f256fc13
538+
PODFILE CHECKSUM: 1d6700a56b42f5d113c60bf174c5b9390544aece
540539

541-
COCOAPODS: 1.10.1
540+
COCOAPODS: 1.11.2

0 commit comments

Comments
 (0)