From cfd8c125bd4644b64bd68270736374d9883ccefb Mon Sep 17 00:00:00 2001 From: Tom McGuire Date: Sun, 19 Jun 2022 12:08:46 -0700 Subject: [PATCH] Update @segment dependencies (#2598) ### Description Updates segment related dependencies upgrade from `com.segment.analytics.android:analytics:4.9.3` to `com.segment.analytics.android:analytics:4.10.1` for [Google PlayStore Compliance](https://play.google.com/console/u/0/developers/5695387721434163201/app/4974776829713250617/inbox?message=MrIBCJIBEpIBbnBjX2xhYmVsLWFwcD00OTc0Nzc2ODI5NzEzMjUwNjE3OjE2NTk5MjU2MzItc2RrPTg0NDQzNzc0ODc3MTc4NTI1NDM6NjY3MTk5OTc1NzE5NjYwMzAyMy1yZWNvbW1lbmRlZF92ZXJzaW9uPTQuMTAuMS10eXBlPW5wY192aW9sYXRpb25faWRfYnJpZGdpbmcqGAoKCIHQ0dHQnoWFTxIKCLnym9%2B0pf2ERQ%3D%3D). - [@segment/analytics-react-native@1.5.3](https://www.npmjs.com/package/@segment/analytics-react-native/v/1.5.3) - [@segment/analytics-react-native-adjust@1.5.3](https://www.npmjs.com/package/@segment/analytics-react-native-adjust/v/1.5.3) - [@segment/analytics-react-native-clevertap@1.5.3](https://www.npmjs.com/package/@segment/analytics-react-native-clevertap/v/1.5.3) - [@segment/analytics-react-native-firebase@1.5.3](https://www.npmjs.com/package/@segment/analytics-react-native-firebase/v/1.5.3) - [react-native-clevertap@0.8.1](https://www.npmjs.com/package/clevertap-react-native/v/0.8.1) ### Other changes N/A ### Tested Tested Locally on Android. ### How others should test This does not need to be tested by QA. ### Related issues N/A ### Backwards compatibility Yes --- android/app/build.gradle | 2 +- ios/Podfile.lock | 76 +++++++++++----------- package.json | 10 +-- patches/clevertap-react-native+0.5.2.patch | 11 ---- yarn.lock | 40 ++++++------ 5 files changed, 64 insertions(+), 75 deletions(-) delete mode 100644 patches/clevertap-react-native+0.5.2.patch diff --git a/android/app/build.gradle b/android/app/build.gradle index 910765c580f..2509c0ed1ff 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -298,7 +298,7 @@ dependencies { implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0" - implementation 'com.clevertap.android:clevertap-android-sdk:4.1.1' + implementation 'com.clevertap.android:clevertap-android-sdk:4.4.0' implementation 'com.google.android.gms:play-services-base:17.4.0' implementation "com.google.firebase:firebase-messaging:21.0.0" implementation 'com.google.android.exoplayer:exoplayer:2.11.5' diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 67419e4a57b..0e169814dff 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,16 +1,16 @@ PODS: - - Adjust (4.29.6): - - Adjust/Core (= 4.29.6) - - Adjust/Core (4.29.6) - - Analytics (4.1.5) + - Adjust (4.29.7): + - Adjust/Core (= 4.29.7) + - Adjust/Core (4.29.7) + - Analytics (4.1.6) - boost (1.76.0) - - CleverTap-iOS-SDK (3.9.3): + - CleverTap-iOS-SDK (4.0.0): - SDWebImage (~> 5.1) - - clevertap-react-native (0.5.2): - - CleverTap-iOS-SDK (= 3.9.3) + - clevertap-react-native (0.8.1): + - CleverTap-iOS-SDK (= 4.0.0) - React-Core - CocoaAsyncSocket (7.6.5) - - CTNotificationService (0.1.3) + - CTNotificationService (0.1.4) - DoubleConversion (1.1.6) - FBLazyVector (0.66.4) - FBReactNativeSpec (0.66.4): @@ -192,26 +192,26 @@ PODS: - GoogleUtilities/Environment (~> 7.2) - nanopb (~> 2.30908.0) - PromisesObjC (~> 1.2) - - GoogleUtilities/AppDelegateSwizzler (7.5.2): + - GoogleUtilities/AppDelegateSwizzler (7.7.0): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.5.2): + - GoogleUtilities/Environment (7.7.0): - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.5.2): + - GoogleUtilities/Logger (7.7.0): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (7.5.2): + - GoogleUtilities/MethodSwizzler (7.7.0): - GoogleUtilities/Logger - - GoogleUtilities/Network (7.5.2): + - GoogleUtilities/Network (7.7.0): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.5.2)" - - GoogleUtilities/Reachability (7.5.2): + - "GoogleUtilities/NSData+zlib (7.7.0)" + - GoogleUtilities/Reachability (7.7.0): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.5.2): + - GoogleUtilities/UserDefaults (7.7.0): - GoogleUtilities/Logger - - GTMSessionFetcher/Core (1.7.0) + - GTMSessionFetcher/Core (1.7.2) - leveldb-library (1.22.1) - libevent (2.1.12) - lottie-ios (3.2.3) @@ -541,20 +541,20 @@ PODS: - React-jsi (= 0.66.4) - React-logger (= 0.66.4) - React-perflogger (= 0.66.4) - - RNAnalytics (1.5.0): + - RNAnalytics (1.5.3): - Analytics - React-Core - - RNAnalyticsIntegration-Adjust (1.5.0): + - RNAnalyticsIntegration-Adjust (1.5.3): - Analytics - React-Core - RNAnalytics - Segment-Adjust (~> 3.1.1) - - RNAnalyticsIntegration-CleverTap (1.5.0): + - RNAnalyticsIntegration-CleverTap (1.5.3): - Analytics - React-Core - RNAnalytics - - Segment-CleverTap (~> 1.1.4) - - RNAnalyticsIntegration-Firebase (1.5.0): + - Segment-CleverTap (~> 1.2.1) + - RNAnalyticsIntegration-Firebase (1.5.3): - Analytics - React-Core - RNAnalytics @@ -664,12 +664,12 @@ PODS: - SDWebImage (5.11.1): - SDWebImage/Core (= 5.11.1) - SDWebImage/Core (5.11.1) - - Segment-Adjust (3.1.2): + - Segment-Adjust (3.1.4): - Adjust (~> 4.29.3) - Analytics - - Segment-CleverTap (1.1.9): + - Segment-CleverTap (1.2.2): - Analytics - - CleverTap-iOS-SDK (~> 3.9.3) + - CleverTap-iOS-SDK (= 4.0.0) - Segment-Firebase (2.7.7): - Analytics - Firebase (~> 7.7) @@ -1019,13 +1019,13 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/yoga" SPEC CHECKSUMS: - Adjust: 94f1c99429fb2a7ebe530294fd66a88d63a54922 - Analytics: 084a3edda6517e308007c1a7810b8f1e8f2925aa + Adjust: 91a06a01e4bb35b432e26b5d5bb8995b95fc381c + Analytics: eefe524436f904b8bb3f8c8c3425280e43b34efc boost: a7c83b31436843459a1961bfd74b96033dc77234 - CleverTap-iOS-SDK: 38f386d9aed648de7ef3ca0e7e2c8531b4cf58e9 - clevertap-react-native: f28f984e24a77559d82bb05786a8c1a7f58c2ce8 + CleverTap-iOS-SDK: fa4737b7cede85e55d49354ce79ef8d08762ddca + clevertap-react-native: 97ccd6512b94fe034c126340b8eb677f28e5baa1 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 - CTNotificationService: 910b253821ef6c08158bf8c7dedc421a4df4cd4c + CTNotificationService: 43d6e66c78bc338bde3db173d615d8cde5f104f7 DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 FBLazyVector: e5569e42a1c79ca00521846c223173a57aca1fe1 FBReactNativeSpec: fe08c1cd7e2e205718d77ad14b34957cce949b58 @@ -1055,8 +1055,8 @@ SPEC CHECKSUMS: glog: 5337263514dd6f09803962437687240c5dc39aa4 GoogleAppMeasurement: fd19169c3034975cb934e865e5667bfdce59df7f GoogleDataTransport: cd9db2180fcecd8da1b561aea31e3e56cf834aa7 - GoogleUtilities: 8de2a97a17e15b6b98e38e8770e2d129a57c0040 - GTMSessionFetcher: 43748f93435c2aa068b1cbe39655aaf600652e91 + GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1 + GTMSessionFetcher: 5595ec75acf5be50814f81e9189490412bad82ba leveldb-library: 50c7b45cbd7bf543c81a468fe557a16ae3db8729 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 lottie-ios: c058aeafa76daa4cf64d773554bccc8385d0150e @@ -1110,10 +1110,10 @@ SPEC CHECKSUMS: React-RCTVibration: e3ffca672dd3772536cb844274094b0e2c31b187 React-runtimeexecutor: dec32ee6f2e2a26e13e58152271535fadff5455a ReactCommon: 57b69f6383eafcbd7da625bfa6003810332313c4 - RNAnalytics: a6dc48511d5d99b1ecaaf7157d8b5c618d15337e - RNAnalyticsIntegration-Adjust: fcd3a1e9e653ea81528cfd21d947d8fa2d865d2a - RNAnalyticsIntegration-CleverTap: abd41dd03f6ee6d7b13c555d6bcde60965fb7366 - RNAnalyticsIntegration-Firebase: 3d3d80be74a53031fc9524d5c5adef2907c28d8f + RNAnalytics: 6fc4977ed662251d8a0066422aed1d1a5f697caf + RNAnalyticsIntegration-Adjust: 99f3f892818a2cb666f9ca6f1d35c3997560208b + RNAnalyticsIntegration-CleverTap: 924d284c088c6008e7599c06dda472742de22c89 + RNAnalyticsIntegration-Firebase: 27eb53875cc0208cc64ec35f06fb0f9e3c012add RNCAsyncStorage: ea6b5c280997b2b32a587793163b1f10e580c4f7 RNCClipboard: 546484405eaa1c8a3eccce77b8c8871242e73b20 RNCMaskedView: c298b644a10c0c142055b3ae24d83879ecb13ccd @@ -1141,8 +1141,8 @@ SPEC CHECKSUMS: RNShare: d76b8c9c6e6ffb38fc18f40b4338c9d867592ed3 RNSVG: 302bfc9905bd8122f08966dc2ce2d07b7b52b9f8 SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d - Segment-Adjust: 7646c502b087a153d89a42059dd53e6d1d143737 - Segment-CleverTap: a0e74aee844bcf859cbbf30dfe3d2ae25d67d9cc + Segment-Adjust: 1a12861ab2e9372fc70af949057490858666cd37 + Segment-CleverTap: 33df087116d5a0a76d2fb3003ed8609c979eac10 Segment-Firebase: 709fff402c50f74c218482603683edd42785cbf9 Sentry: 5c5dd4005f3b7b9765d5a8871232cddbd0d888b7 Toast: 91b396c56ee72a5790816f40d3a94dd357abc196 diff --git a/package.json b/package.json index ec455dea7c6..0b52c560394 100644 --- a/package.json +++ b/package.json @@ -94,10 +94,10 @@ "@react-navigation/native": "^5.9.8", "@react-navigation/stack": "^5.14.9", "@reduxjs/toolkit": "^1.6.2", - "@segment/analytics-react-native": "^1.5.0", - "@segment/analytics-react-native-adjust": "^1.5.0", - "@segment/analytics-react-native-clevertap": "^1.5.0", - "@segment/analytics-react-native-firebase": "^1.5.0", + "@segment/analytics-react-native": "^1.5.3", + "@segment/analytics-react-native-adjust": "^1.5.3", + "@segment/analytics-react-native-clevertap": "^1.5.3", + "@segment/analytics-react-native-firebase": "^1.5.3", "@sentry/react-native": "^3.2.8", "@ungap/url-search-params": "^0.1.2", "@walletconnect/client": "^1.6.5", @@ -108,7 +108,7 @@ "await-lock": "^2.1.0", "bignumber.js": "^9.0.0", "bn.js": "4.11.9", - "clevertap-react-native": "^0.5.0", + "clevertap-react-native": "^0.8.1", "country-data": "^0.0.31", "crypto-js": "^3.1.9-1", "date-fns": "^2.12.0", diff --git a/patches/clevertap-react-native+0.5.2.patch b/patches/clevertap-react-native+0.5.2.patch deleted file mode 100644 index 78fc20577ea..00000000000 --- a/patches/clevertap-react-native+0.5.2.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/node_modules/clevertap-react-native/clevertap-react-native.podspec b/node_modules/clevertap-react-native/clevertap-react-native.podspec -index c27cf1f..dea6876 100644 ---- a/node_modules/clevertap-react-native/clevertap-react-native.podspec -+++ b/node_modules/clevertap-react-native/clevertap-react-native.podspec -@@ -19,5 +19,5 @@ Pod::Spec.new do |s| - s.source_files = 'ios/CleverTapReact/*.{h,m}' - - s.dependency 'CleverTap-iOS-SDK', '3.9.3' -- s.dependency 'React' -+ s.dependency 'React-Core' - end diff --git a/yarn.lock b/yarn.lock index a1be1d03aaf..2bad45942aa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4490,25 +4490,25 @@ dependencies: any-observable "^0.3.0" -"@segment/analytics-react-native-adjust@^1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@segment/analytics-react-native-adjust/-/analytics-react-native-adjust-1.5.0.tgz#73d721ef9b7462648a8b02d628e798a3f56bf1e4" - integrity sha512-h69KQqaduJ8jWpOVSBlnep56WHFZr0u4TABi58JvlSwHW1/UMvk4LqDUPrb/5Lk+jhBxle1nYmmyfd85c6DyEA== +"@segment/analytics-react-native-adjust@^1.5.3": + version "1.5.3" + resolved "https://registry.yarnpkg.com/@segment/analytics-react-native-adjust/-/analytics-react-native-adjust-1.5.3.tgz#5bb3ea94dba8119caffaaca4cea67402b539d259" + integrity sha512-13GLG9NPLYknNK5ll6MNI4C57ST9q+SUgoWgb5ppbj7zOdRnpJiO3V5fEhC16c0X0OAYnSdXhjZcK4QMcRMBqA== -"@segment/analytics-react-native-clevertap@^1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@segment/analytics-react-native-clevertap/-/analytics-react-native-clevertap-1.5.0.tgz#7ceb9f4a361d47f947cae362d425d54ec084113b" - integrity sha512-4eXJgcLbPQnSDYSjO8Kwx/OxgrE2uA0WzXSWZOrG0FOtVaGQLldMYuwAdT5yRXCfq8xQtceiz9qopVsPHCrOwA== +"@segment/analytics-react-native-clevertap@^1.5.3": + version "1.5.3" + resolved "https://registry.yarnpkg.com/@segment/analytics-react-native-clevertap/-/analytics-react-native-clevertap-1.5.3.tgz#4a2ed42fa3cd4601618792e08dd26d2f82ad860d" + integrity sha512-pkJ/+LxiN99T9p78ERd64t+Tlrxn1YRk+KjdxkVURFm5e9y8clc4RtbFWQmknzRzVZkb0pf49dKaLHBgsAXDDA== -"@segment/analytics-react-native-firebase@^1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@segment/analytics-react-native-firebase/-/analytics-react-native-firebase-1.5.0.tgz#a95386e92de7452a19bc7ef0fbd12148c46fd490" - integrity sha512-9HNDiX/n6NFrUK3tEHxtVrcqCagO4DzSuWyVbhkzrerVEGpE4i3MqCzVCPAyU0MCEK3h+9Z66eZDxWCHSYAl0A== +"@segment/analytics-react-native-firebase@^1.5.3": + version "1.5.3" + resolved "https://registry.yarnpkg.com/@segment/analytics-react-native-firebase/-/analytics-react-native-firebase-1.5.3.tgz#34d85e0dcda57863037bbb2f04ae74909ec2c45b" + integrity sha512-i+QZKbHX1/JZL9T6wuioB/PGMEXd/bJtslRTlGxm8dHL7X/JovQbiy6OmN2Y0fXh7RwAConlFzbqPe+eIcnaHA== -"@segment/analytics-react-native@^1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@segment/analytics-react-native/-/analytics-react-native-1.5.0.tgz#14538b8c018202ef62daf8c5b3898312a057fbde" - integrity sha512-hW93MKffFfkqNec615jQUB5wJHb5KyIcZitIVF5L7cZZxBCM7rQjVdwV9Jdk3KGFwjnWGRkAjDD2DkJZYqz7KQ== +"@segment/analytics-react-native@^1.5.3": + version "1.5.3" + resolved "https://registry.yarnpkg.com/@segment/analytics-react-native/-/analytics-react-native-1.5.3.tgz#0fc0ec3ffbe01cad06c728360c67379660486402" + integrity sha512-sCUSqppTHKEB1FkvplO1e+uALyidTZSa/LnxrvuClsjP8Q5s5rfxLgK/aj3D3ffScIefQd+v9gY2cBjAo3zMWw== "@sentry/browser@6.12.0": version "6.12.0" @@ -7511,10 +7511,10 @@ clean-stack@^2.0.0: resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.1.0.tgz#9e7fec7f3f8340a2ab4f127c80273085e8fbbdd0" integrity sha512-uQWrpRm+iZZUCAp7ZZJQbd4Za9I3AjR/3YTjmcnAtkauaIm/T5CT6U8zVI6e60T6OANqBFAzuR9/HB3NzuZCRA== -clevertap-react-native@^0.5.0: - version "0.5.2" - resolved "https://registry.yarnpkg.com/clevertap-react-native/-/clevertap-react-native-0.5.2.tgz#075a5d5001e845ce2064a9d106fb5383b5851e8f" - integrity sha512-1EV7AXp4Fqfz/VRsL1GgqnNEnsjtmCzaQZCuYUSq4YTzxI9IsHs16NUxB2VJVOC2oqbi8w5gsj1kwKMISC5WCw== +clevertap-react-native@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/clevertap-react-native/-/clevertap-react-native-0.8.1.tgz#168a4d421e20157aea2f4cf4fdd6515a2549b8b4" + integrity sha512-Ierz74Vi9oY7ZgTLBRkDOLb8i7t5Qn+lMThgQE0IWYRY1fK3XbxmQlP3oKZcYRL5rqOrCfRqHDOk2IbVDVn4tQ== dependencies: extract-zip "^1.6.6"