From 6a1741f3d2deaeb9eda83a5e3532354ea86aac88 Mon Sep 17 00:00:00 2001 From: Tomas Date: Wed, 27 Jul 2022 04:55:05 +0200 Subject: [PATCH 01/16] feat: upgrading targetSdkVersion --- android/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index c39195663bc2..a80b212d8de1 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -4,12 +4,12 @@ buildscript { ext { buildToolsVersion = "30.0.2" minSdkVersion = 21 - compileSdkVersion = 30 - targetSdkVersion = 30 + compileSdkVersion = 31 + targetSdkVersion = 31 androidXCore = "1.0.2" multiDexEnabled = true googlePlayServicesVersion = "17.0.0" - kotlinVersion = '1.4.21' + kotlinVersion = '1.6.0' } repositories { google() From 0d21e9e8eab057fb47549de2d99e5aeb74333251 Mon Sep 17 00:00:00 2001 From: Tomas Date: Wed, 27 Jul 2022 04:55:57 +0200 Subject: [PATCH 02/16] feat: updating npm pkgs for new targetSdkVersion --- package-lock.json | 40 ++++++++++++++++++++-------------------- package.json | 4 ++-- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index 452124058579..0edf331b5835 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5264,11 +5264,11 @@ "dev": true }, "@react-native-async-storage/async-storage": { - "version": "1.15.5", - "resolved": "https://registry.npmjs.org/@react-native-async-storage/async-storage/-/async-storage-1.15.5.tgz", - "integrity": "sha512-4AYehLH39B9a8UXCMf3ieOK+G61wGMP72ikx6/XSMA0DUnvx0PgaeaT2Wyt06kTrDTy8edewKnbrbeqwaM50TQ==", + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/@react-native-async-storage/async-storage/-/async-storage-1.17.7.tgz", + "integrity": "sha512-mDtWhCcpxzrZhA95f6zi0pnBsjBEZW1LKZWfxVXG0UfaWpPxDBCKowNk2xjRTytckZeVhjmPJPtBU+8QNQcR0A==", "requires": { - "deep-assign": "^3.0.0" + "merge-options": "^3.0.4" } }, "@react-native-community/cameraroll": { @@ -27822,14 +27822,6 @@ "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=", "dev": true }, - "deep-assign": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/deep-assign/-/deep-assign-3.0.0.tgz", - "integrity": "sha512-YX2i9XjJ7h5q/aQ/IM9PEwEnDqETAIYbggmdDB3HLTlSgo1CxPsj6pvhPG68rq6SVE0+p+6Ywsm5fTYNrYtBWw==", - "requires": { - "is-obj": "^1.0.0" - } - }, "deep-equal": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", @@ -33672,11 +33664,6 @@ "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz", "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==" }, - "is-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", - "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" - }, "is-object": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz", @@ -33707,6 +33694,11 @@ "path-is-inside": "^1.0.2" } }, + "is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==" + }, "is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", @@ -38283,6 +38275,14 @@ "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", "dev": true }, + "merge-options": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/merge-options/-/merge-options-3.0.4.tgz", + "integrity": "sha512-2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ==", + "requires": { + "is-plain-obj": "^2.1.0" + } + }, "merge-refs": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/merge-refs/-/merge-refs-1.0.0.tgz", @@ -48522,9 +48522,9 @@ } }, "urbanairship-react-native": { - "version": "11.0.2", - "resolved": "https://registry.npmjs.org/urbanairship-react-native/-/urbanairship-react-native-11.0.2.tgz", - "integrity": "sha512-CH5frL9gVAeRFuJm61MC5nAFsfGu9pxT94jQwjtTKqrTlwd/EMoFgYrV1ITuub70MInCD3OFP0FDA3H8YJdZtQ==" + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/urbanairship-react-native/-/urbanairship-react-native-13.0.0.tgz", + "integrity": "sha512-lSiVoESDC6NPUdaQETFHRVKoLvf/mlQj3lzKo3cSSCqFoVjaIT7kVgsDutDQ8oBd3okOjSKC7EBkFcrc0sZ1HQ==" }, "uri-js": { "version": "4.4.0", diff --git a/package.json b/package.json index 14782a7aa80c..3b27348b5666 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@formatjs/intl-numberformat": "^6.2.5", "@formatjs/intl-pluralrules": "^4.0.13", "@onfido/react-native-sdk": "^5.4.0", - "@react-native-async-storage/async-storage": "^1.15.5", + "@react-native-async-storage/async-storage": "^1.17.7", "@react-native-community/cameraroll": "^4.1.2", "@react-native-community/clipboard": "^1.5.1", "@react-native-community/datetimepicker": "^3.5.2", @@ -109,7 +109,7 @@ "save": "^2.4.0", "shim-keyboard-event-key": "^1.0.3", "underscore": "^1.13.1", - "urbanairship-react-native": "^11.0.2" + "urbanairship-react-native": "^13.0.0" }, "devDependencies": { "@actions/core": "^1.2.6", From 33ef541392428f732ba796bd7c2afcd9baef3bd5 Mon Sep 17 00:00:00 2001 From: Tomas Date: Wed, 27 Jul 2022 04:57:03 +0200 Subject: [PATCH 03/16] feat: android:exported for activities --- android/app/src/main/AndroidManifest.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index a5d23081f6f2..2c31e2a50393 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -29,15 +29,16 @@ + android:launchMode="singleTask" + android:exported="true"> - + - + @@ -45,7 +46,7 @@ - + From b1ccedf8da4e9bce403cfb8041a2805f441e6001 Mon Sep 17 00:00:00 2001 From: Tomas Date: Wed, 27 Jul 2022 23:19:55 +0200 Subject: [PATCH 04/16] chore: adds assetlinks.json for link verification --- .well-known/assetlinks.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .well-known/assetlinks.json diff --git a/.well-known/assetlinks.json b/.well-known/assetlinks.json new file mode 100644 index 000000000000..a28004b45b08 --- /dev/null +++ b/.well-known/assetlinks.json @@ -0,0 +1,8 @@ +[{ + "relation": ["delegate_permission/common.handle_all_urls"], + "target": { + "namespace": "android_app", + "package_name": "com.expensify.chat", + "sha256_cert_fingerprints": ["2E:65:6F:1C:34:F5:7E:BF:FC:C0:2D:A3:14:0E:83:FE:61:51:F2:9B:5D:59:58:61:C4:4D:A9:99:0C:CA:F4:8E"] + } +}] \ No newline at end of file From e55f74de55f087e1b0fd77afdc1c6d2356ccb0b2 Mon Sep 17 00:00:00 2001 From: Tomas Date: Wed, 27 Jul 2022 23:20:37 +0200 Subject: [PATCH 05/16] chore: webpack config to deploy assetlinks.json --- config/webpack/webpack.common.js | 1 + 1 file changed, 1 insertion(+) diff --git a/config/webpack/webpack.common.js b/config/webpack/webpack.common.js index e6002e4166d0..d7bc11ed078b 100644 --- a/config/webpack/webpack.common.js +++ b/config/webpack/webpack.common.js @@ -56,6 +56,7 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({ {from: 'node_modules/react-pdf/dist/esm/Page/AnnotationLayer.css', to: 'css/AnnotationLayer.css'}, {from: 'assets/images/shadow.png', to: 'images/shadow.png'}, {from: '.well-known/apple-app-site-association', to: '.well-known/apple-app-site-association', toType: 'file'}, + {from: '.well-known/assetlinks.json', to: '.well-known/assetlinks.json'}, // These files are copied over as per instructions here // https://github.com/wojtekmaj/react-pdf#copying-cmaps From 921bf0c33ea9695a087f8162a97f704a8bd68aa4 Mon Sep 17 00:00:00 2001 From: Tomas Date: Thu, 4 Aug 2022 05:04:41 +0200 Subject: [PATCH 06/16] fix: removing old Swift reference --- ios/NewExpensify.xcodeproj/project.pbxproj | 1 - 1 file changed, 1 deletion(-) diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj index de0bf9bf28ff..7dbef8e876f8 100644 --- a/ios/NewExpensify.xcodeproj/project.pbxproj +++ b/ios/NewExpensify.xcodeproj/project.pbxproj @@ -960,7 +960,6 @@ LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)"; LIBRARY_SEARCH_PATHS = ( "\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"", - "\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"", "\"$(inherited)\"", ); MTL_ENABLE_DEBUG_INFO = YES; From fa5ccf846968b71c05669e6c8c879819296f4209 Mon Sep 17 00:00:00 2001 From: Tomas Date: Thu, 4 Aug 2022 07:21:42 +0200 Subject: [PATCH 07/16] fix: removing old Swift reference 2 --- ios/NewExpensify.xcodeproj/project.pbxproj | 1 - 1 file changed, 1 deletion(-) diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj index 7dbef8e876f8..81eaa00475a8 100644 --- a/ios/NewExpensify.xcodeproj/project.pbxproj +++ b/ios/NewExpensify.xcodeproj/project.pbxproj @@ -1013,7 +1013,6 @@ LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)"; LIBRARY_SEARCH_PATHS = ( "\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"", - "\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"", "\"$(inherited)\"", ); MTL_ENABLE_DEBUG_INFO = NO; From 15f6dc49aefedce4fa47af099b28f7d45218f36e Mon Sep 17 00:00:00 2001 From: Tomas Date: Thu, 4 Aug 2022 07:42:25 +0200 Subject: [PATCH 08/16] feat: updating to urbanairship-react-native@14.0.0 --- ios/NewExpensify.xcodeproj/project.pbxproj | 240 ++------------------- ios/Podfile.lock | 39 ++-- package-lock.json | 6 +- package.json | 2 +- 4 files changed, 43 insertions(+), 244 deletions(-) diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj index 81eaa00475a8..ca24d38024b0 100644 --- a/ios/NewExpensify.xcodeproj/project.pbxproj +++ b/ios/NewExpensify.xcodeproj/project.pbxproj @@ -368,120 +368,18 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests-resources.sh", - "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAAutomationActions.plist", - "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAInAppMessageBannerContentView.xib", - "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAInAppMessageBannerView.xib", - "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAInAppMessageButtonView.xib", - "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAInAppMessageFullScreenViewController.xib", - "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAInAppMessageHTMLViewController.xib", - "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAInAppMessageModalViewController.xib", - "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAInAppMessageResizableViewController.xib", - "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAAutomation.xcdatamodeld", - "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAFrequencyLimits.xcdatamodeld", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/UADefaultActions.plist", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/UADefaultActionsTvOS.plist", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/UANativeBridge", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/UANotificationCategories.plist", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/ar.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/cs.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/da.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/de.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/en.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/es-419.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/es.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/fi.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/fr.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/hi.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/hu.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/id.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/it.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/iw.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/ja.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/ko.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/ms.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/nl.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/no.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/pl.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/pt-PT.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/pt.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/ro.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/ru.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/sk.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/sv.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/th.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/tr.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/UAEvents.xcdatamodeld", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/UARemoteData.xcdatamodeld", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/vi.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/zh-Hans.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/zh-Hant.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipExtendedActions/Resources/UAExtendedActions.plist", - "${PODS_ROOT}/Airship/Airship/AirshipExtendedActions/Resources/UARateAppPromptView.xib", - "${PODS_ROOT}/Airship/Airship/AirshipMessageCenter/Resources/UADefaultMessageCenterListViewController.xib", - "${PODS_ROOT}/Airship/Airship/AirshipMessageCenter/Resources/UADefaultMessageCenterMessageViewController.xib", - "${PODS_ROOT}/Airship/Airship/AirshipMessageCenter/Resources/UAMessageCenterActions.plist", - "${PODS_ROOT}/Airship/Airship/AirshipMessageCenter/Resources/UAMessageCenterListCell.xib", - "${PODS_ROOT}/Airship/Airship/AirshipMessageCenter/Resources/UAMessageCenterPlaceholderIcon.png", - "${PODS_ROOT}/Airship/Airship/AirshipMessageCenter/Resources/UAInbox.xcdatamodeld", + "${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipAutomationResources.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipCoreResources.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipExtendedActionsResources.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipMessageCenterResources.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAAutomationActions.plist", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInAppMessageBannerContentView.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInAppMessageBannerView.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInAppMessageButtonView.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInAppMessageFullScreenViewController.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInAppMessageHTMLViewController.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInAppMessageModalViewController.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInAppMessageResizableViewController.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAAutomation.momd", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAFrequencyLimits.momd", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UADefaultActions.plist", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UADefaultActionsTvOS.plist", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UANativeBridge", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UANotificationCategories.plist", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ar.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/cs.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/da.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/de.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/en.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/es-419.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/es.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/fi.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/fr.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/hi.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/hu.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/id.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/it.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/iw.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ja.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ko.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ms.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/nl.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/no.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/pl.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/pt-PT.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/pt.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ro.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ru.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/sk.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/sv.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/th.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/tr.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAEvents.momd", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UARemoteData.momd", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/vi.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/zh-Hans.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/zh-Hant.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAExtendedActions.plist", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UARateAppPromptView.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UADefaultMessageCenterListViewController.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UADefaultMessageCenterMessageViewController.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAMessageCenterActions.plist", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAMessageCenterListCell.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAMessageCenterPlaceholderIcon.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInbox.momd", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipAutomationResources.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipCoreResources.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipExtendedActionsResources.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipMessageCenterResources.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle", ); runOnlyForDeploymentPostprocessing = 0; @@ -557,120 +455,18 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-NewExpensify/Pods-NewExpensify-resources.sh", - "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAAutomationActions.plist", - "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAInAppMessageBannerContentView.xib", - "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAInAppMessageBannerView.xib", - "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAInAppMessageButtonView.xib", - "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAInAppMessageFullScreenViewController.xib", - "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAInAppMessageHTMLViewController.xib", - "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAInAppMessageModalViewController.xib", - "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAInAppMessageResizableViewController.xib", - "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAAutomation.xcdatamodeld", - "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAFrequencyLimits.xcdatamodeld", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/UADefaultActions.plist", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/UADefaultActionsTvOS.plist", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/UANativeBridge", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/UANotificationCategories.plist", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/ar.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/cs.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/da.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/de.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/en.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/es-419.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/es.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/fi.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/fr.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/hi.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/hu.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/id.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/it.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/iw.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/ja.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/ko.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/ms.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/nl.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/no.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/pl.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/pt-PT.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/pt.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/ro.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/ru.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/sk.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/sv.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/th.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/tr.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/UAEvents.xcdatamodeld", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/UARemoteData.xcdatamodeld", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/vi.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/zh-Hans.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/zh-Hant.lproj", - "${PODS_ROOT}/Airship/Airship/AirshipExtendedActions/Resources/UAExtendedActions.plist", - "${PODS_ROOT}/Airship/Airship/AirshipExtendedActions/Resources/UARateAppPromptView.xib", - "${PODS_ROOT}/Airship/Airship/AirshipMessageCenter/Resources/UADefaultMessageCenterListViewController.xib", - "${PODS_ROOT}/Airship/Airship/AirshipMessageCenter/Resources/UADefaultMessageCenterMessageViewController.xib", - "${PODS_ROOT}/Airship/Airship/AirshipMessageCenter/Resources/UAMessageCenterActions.plist", - "${PODS_ROOT}/Airship/Airship/AirshipMessageCenter/Resources/UAMessageCenterListCell.xib", - "${PODS_ROOT}/Airship/Airship/AirshipMessageCenter/Resources/UAMessageCenterPlaceholderIcon.png", - "${PODS_ROOT}/Airship/Airship/AirshipMessageCenter/Resources/UAInbox.xcdatamodeld", + "${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipAutomationResources.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipCoreResources.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipExtendedActionsResources.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipMessageCenterResources.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAAutomationActions.plist", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInAppMessageBannerContentView.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInAppMessageBannerView.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInAppMessageButtonView.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInAppMessageFullScreenViewController.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInAppMessageHTMLViewController.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInAppMessageModalViewController.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInAppMessageResizableViewController.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAAutomation.momd", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAFrequencyLimits.momd", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UADefaultActions.plist", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UADefaultActionsTvOS.plist", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UANativeBridge", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UANotificationCategories.plist", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ar.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/cs.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/da.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/de.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/en.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/es-419.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/es.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/fi.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/fr.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/hi.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/hu.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/id.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/it.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/iw.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ja.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ko.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ms.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/nl.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/no.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/pl.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/pt-PT.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/pt.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ro.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ru.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/sk.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/sv.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/th.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/tr.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAEvents.momd", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UARemoteData.momd", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/vi.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/zh-Hans.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/zh-Hant.lproj", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAExtendedActions.plist", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UARateAppPromptView.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UADefaultMessageCenterListViewController.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UADefaultMessageCenterMessageViewController.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAMessageCenterActions.plist", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAMessageCenterListCell.nib", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAMessageCenterPlaceholderIcon.png", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInbox.momd", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipAutomationResources.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipCoreResources.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipExtendedActionsResources.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipMessageCenterResources.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle", ); runOnlyForDeploymentPostprocessing = 0; @@ -940,7 +736,7 @@ COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386"; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -1000,7 +796,7 @@ COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386"; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 1aea6abedf1a..f5b2a3244cdc 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,15 +1,18 @@ PODS: - - Airship (14.4.2): - - Airship/Automation (= 14.4.2) - - Airship/Core (= 14.4.2) - - Airship/ExtendedActions (= 14.4.2) - - Airship/MessageCenter (= 14.4.2) - - Airship/Automation (14.4.2): + - Airship (16.4.0): + - Airship/Automation (= 16.4.0) + - Airship/Basement (= 16.4.0) + - Airship/Core (= 16.4.0) + - Airship/ExtendedActions (= 16.4.0) + - Airship/MessageCenter (= 16.4.0) + - Airship/Automation (16.4.0): - Airship/Core - - Airship/Core (14.4.2) - - Airship/ExtendedActions (14.4.2): + - Airship/Basement (16.4.0) + - Airship/Core (16.4.0): + - Airship/Basement + - Airship/ExtendedActions (16.4.0): - Airship/Core - - Airship/MessageCenter (14.4.2): + - Airship/MessageCenter (16.4.0): - Airship/Core - boost (1.76.0) - CocoaAsyncSocket (7.6.5) @@ -443,7 +446,7 @@ PODS: - React-Core - react-native-document-picker (8.0.0): - React-Core - - react-native-flipper (0.117.0): + - react-native-flipper (0.146.1): - React-Core - react-native-image-picker (4.7.3): - React-Core @@ -531,7 +534,7 @@ PODS: - React-perflogger (= 0.66.4) - rn-fetch-blob (0.12.0): - React-Core - - RNCAsyncStorage (1.15.5): + - RNCAsyncStorage (1.17.7): - React-Core - RNCClipboard (1.5.1): - React-Core @@ -605,8 +608,8 @@ PODS: - SDWebImageWebPCoder (0.8.5): - libwebp (~> 1.0) - SDWebImage/Core (~> 5.10) - - urbanairship-react-native (11.0.2): - - Airship (= 14.4.2) + - urbanairship-react-native (14.0.0): + - Airship (= 16.4.0) - React-Core - Yoga (1.14.0) - YogaKit (1.18.1): @@ -880,7 +883,7 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/yoga" SPEC CHECKSUMS: - Airship: 29d674abeac754f783fc46c7d383d6f046687341 + Airship: 755b12485ab6001bc846001edf31a9bceb675689 boost: a7c83b31436843459a1961bfd74b96033dc77234 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 @@ -938,7 +941,7 @@ SPEC CHECKSUMS: react-native-cameraroll: 60ac50a5209777cbccfe8d7a62d0743a9da87060 react-native-config: 6502b1879f97ed5ac570a029961fc35ea606cd14 react-native-document-picker: 772d04a4bc5c35da9abe27b08ac271420ae3f9ef - react-native-flipper: cd9eabd8917104c1bbdca2621717cdca3b2addef + react-native-flipper: 4bfe0a324e663f1ae2f76ad0da75673de6895efe react-native-image-picker: ae1202414bd5c37c00b2a701daa5b6194a06b7d9 react-native-netinfo: ebbcd8fbe1a0ce7035e43cd18c5a545dcb93dd08 react-native-pdf: 4b5a9e4465a6a3b399e91dc4838eb44ddf716d1f @@ -961,7 +964,7 @@ SPEC CHECKSUMS: React-runtimeexecutor: dec32ee6f2e2a26e13e58152271535fadff5455a ReactCommon: 57b69f6383eafcbd7da625bfa6003810332313c4 rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba - RNCAsyncStorage: 8324611026e8dc3706f829953aa6e3899f581589 + RNCAsyncStorage: 19af8f3e136504e0450e7f85cfb46fc38da87ec9 RNCClipboard: 5e299c6df8e0c98f3d7416b86ae563d3a9f768a3 RNCMaskedView: 138134c4d8a9421b4f2bf39055a79aa05c2d47b1 RNCPicker: f6c760d4b314585ff35165d8640d7917ae30afb1 @@ -979,10 +982,10 @@ SPEC CHECKSUMS: RNSVG: ce9d996113475209013317e48b05c21ee988d42e SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d - urbanairship-react-native: 60b4b4235838ff109a2639b639e2ef01d54ad455 + urbanairship-react-native: 4e805253e716f01c410ab7614f152d00676bd390 Yoga: e7dc4e71caba6472ff48ad7d234389b91dadc280 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: 431123d7514c52fa4516724b89c20d02c87ad8c8 -COCOAPODS: 1.11.2 +COCOAPODS: 1.11.3 diff --git a/package-lock.json b/package-lock.json index 0edf331b5835..5c5262963b58 100644 --- a/package-lock.json +++ b/package-lock.json @@ -48522,9 +48522,9 @@ } }, "urbanairship-react-native": { - "version": "13.0.0", - "resolved": "https://registry.npmjs.org/urbanairship-react-native/-/urbanairship-react-native-13.0.0.tgz", - "integrity": "sha512-lSiVoESDC6NPUdaQETFHRVKoLvf/mlQj3lzKo3cSSCqFoVjaIT7kVgsDutDQ8oBd3okOjSKC7EBkFcrc0sZ1HQ==" + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/urbanairship-react-native/-/urbanairship-react-native-14.0.0.tgz", + "integrity": "sha512-YIsA+IyiqT1mpvsYgflQGEsbEso92woWmEflP+VnErQManrktyMH64cjiUxERm+jYM00WbRQY9cTxP9AEkalQg==" }, "uri-js": { "version": "4.4.0", diff --git a/package.json b/package.json index 3b27348b5666..6e6b5c1d28f1 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "save": "^2.4.0", "shim-keyboard-event-key": "^1.0.3", "underscore": "^1.13.1", - "urbanairship-react-native": "^13.0.0" + "urbanairship-react-native": "^14.0.0" }, "devDependencies": { "@actions/core": "^1.2.6", From 93e92b185277f45a19557d94616dcf75d39defc4 Mon Sep 17 00:00:00 2001 From: Tomas Date: Thu, 11 Aug 2022 10:14:50 +0200 Subject: [PATCH 09/16] Revert "feat: upgrading targetSdkVersion" This reverts commit 6a1741f3d2deaeb9eda83a5e3532354ea86aac88. --- android/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index a80b212d8de1..c39195663bc2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -4,12 +4,12 @@ buildscript { ext { buildToolsVersion = "30.0.2" minSdkVersion = 21 - compileSdkVersion = 31 - targetSdkVersion = 31 + compileSdkVersion = 30 + targetSdkVersion = 30 androidXCore = "1.0.2" multiDexEnabled = true googlePlayServicesVersion = "17.0.0" - kotlinVersion = '1.6.0' + kotlinVersion = '1.4.21' } repositories { google() From f5ecc63193dac9b31cbb6f6782742f1362b1f207 Mon Sep 17 00:00:00 2001 From: Tomas Date: Thu, 11 Aug 2022 10:20:10 +0200 Subject: [PATCH 10/16] Revert "feat: updating npm pkgs for new targetSdkVersion" This reverts commit 0d21e9e8eab057fb47549de2d99e5aeb74333251. --- package-lock.json | 40 ++++++++++++++++++++-------------------- package.json | 4 ++-- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5c5262963b58..3850945afb98 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5264,11 +5264,11 @@ "dev": true }, "@react-native-async-storage/async-storage": { - "version": "1.17.7", - "resolved": "https://registry.npmjs.org/@react-native-async-storage/async-storage/-/async-storage-1.17.7.tgz", - "integrity": "sha512-mDtWhCcpxzrZhA95f6zi0pnBsjBEZW1LKZWfxVXG0UfaWpPxDBCKowNk2xjRTytckZeVhjmPJPtBU+8QNQcR0A==", + "version": "1.15.5", + "resolved": "https://registry.npmjs.org/@react-native-async-storage/async-storage/-/async-storage-1.15.5.tgz", + "integrity": "sha512-4AYehLH39B9a8UXCMf3ieOK+G61wGMP72ikx6/XSMA0DUnvx0PgaeaT2Wyt06kTrDTy8edewKnbrbeqwaM50TQ==", "requires": { - "merge-options": "^3.0.4" + "deep-assign": "^3.0.0" } }, "@react-native-community/cameraroll": { @@ -27822,6 +27822,14 @@ "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=", "dev": true }, + "deep-assign": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/deep-assign/-/deep-assign-3.0.0.tgz", + "integrity": "sha512-YX2i9XjJ7h5q/aQ/IM9PEwEnDqETAIYbggmdDB3HLTlSgo1CxPsj6pvhPG68rq6SVE0+p+6Ywsm5fTYNrYtBWw==", + "requires": { + "is-obj": "^1.0.0" + } + }, "deep-equal": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", @@ -33664,6 +33672,11 @@ "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.5.tgz", "integrity": "sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==" }, + "is-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", + "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" + }, "is-object": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz", @@ -33694,11 +33707,6 @@ "path-is-inside": "^1.0.2" } }, - "is-plain-obj": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", - "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==" - }, "is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", @@ -38275,14 +38283,6 @@ "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", "dev": true }, - "merge-options": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/merge-options/-/merge-options-3.0.4.tgz", - "integrity": "sha512-2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ==", - "requires": { - "is-plain-obj": "^2.1.0" - } - }, "merge-refs": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/merge-refs/-/merge-refs-1.0.0.tgz", @@ -48522,9 +48522,9 @@ } }, "urbanairship-react-native": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/urbanairship-react-native/-/urbanairship-react-native-14.0.0.tgz", - "integrity": "sha512-YIsA+IyiqT1mpvsYgflQGEsbEso92woWmEflP+VnErQManrktyMH64cjiUxERm+jYM00WbRQY9cTxP9AEkalQg==" + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/urbanairship-react-native/-/urbanairship-react-native-13.0.0.tgz", + "integrity": "sha512-lSiVoESDC6NPUdaQETFHRVKoLvf/mlQj3lzKo3cSSCqFoVjaIT7kVgsDutDQ8oBd3okOjSKC7EBkFcrc0sZ1HQ==" }, "uri-js": { "version": "4.4.0", diff --git a/package.json b/package.json index 6e6b5c1d28f1..0eec3d78158c 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@formatjs/intl-numberformat": "^6.2.5", "@formatjs/intl-pluralrules": "^4.0.13", "@onfido/react-native-sdk": "^5.4.0", - "@react-native-async-storage/async-storage": "^1.17.7", + "@react-native-async-storage/async-storage": "^1.15.5", "@react-native-community/cameraroll": "^4.1.2", "@react-native-community/clipboard": "^1.5.1", "@react-native-community/datetimepicker": "^3.5.2", @@ -109,7 +109,7 @@ "save": "^2.4.0", "shim-keyboard-event-key": "^1.0.3", "underscore": "^1.13.1", - "urbanairship-react-native": "^14.0.0" + "urbanairship-react-native": "^13.0.0" }, "devDependencies": { "@actions/core": "^1.2.6", From c0844c05d4aed8249a6a5dc408cb127f96946dd7 Mon Sep 17 00:00:00 2001 From: Tomas Date: Thu, 11 Aug 2022 10:22:01 +0200 Subject: [PATCH 11/16] Revert "feat: android:exported for activities" This reverts commit 33ef541392428f732ba796bd7c2afcd9baef3bd5. --- android/app/src/main/AndroidManifest.xml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 2c31e2a50393..a5d23081f6f2 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -29,16 +29,15 @@ + android:launchMode="singleTask"> - + - + @@ -46,7 +45,7 @@ - + From 01b905e39003a12c1314fd64e720637436df7b4b Mon Sep 17 00:00:00 2001 From: Tomas Date: Thu, 11 Aug 2022 10:23:01 +0200 Subject: [PATCH 12/16] Revert "fix: removing old Swift reference" This reverts commit 921bf0c33ea9695a087f8162a97f704a8bd68aa4. --- ios/NewExpensify.xcodeproj/project.pbxproj | 1 + 1 file changed, 1 insertion(+) diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj index ca24d38024b0..fc9e9b0bdcf5 100644 --- a/ios/NewExpensify.xcodeproj/project.pbxproj +++ b/ios/NewExpensify.xcodeproj/project.pbxproj @@ -756,6 +756,7 @@ LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)"; LIBRARY_SEARCH_PATHS = ( "\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"", + "\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"", "\"$(inherited)\"", ); MTL_ENABLE_DEBUG_INFO = YES; From 2fb98533aad7375aec484671896030dea6ed1561 Mon Sep 17 00:00:00 2001 From: Tomas Date: Thu, 11 Aug 2022 10:23:36 +0200 Subject: [PATCH 13/16] Revert "fix: removing old Swift reference 2" This reverts commit fa5ccf846968b71c05669e6c8c879819296f4209. --- ios/NewExpensify.xcodeproj/project.pbxproj | 1 + 1 file changed, 1 insertion(+) diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj index fc9e9b0bdcf5..c746f1a71270 100644 --- a/ios/NewExpensify.xcodeproj/project.pbxproj +++ b/ios/NewExpensify.xcodeproj/project.pbxproj @@ -810,6 +810,7 @@ LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)"; LIBRARY_SEARCH_PATHS = ( "\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"", + "\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"", "\"$(inherited)\"", ); MTL_ENABLE_DEBUG_INFO = NO; From 99b0890dfb421ec1c58f4269c6b5f1eb5969dd6c Mon Sep 17 00:00:00 2001 From: Tomas Date: Thu, 11 Aug 2022 10:24:11 +0200 Subject: [PATCH 14/16] Revert "feat: updating to urbanairship-react-native@14.0.0" This reverts commit 15f6dc49aefedce4fa47af099b28f7d45218f36e. --- ios/NewExpensify.xcodeproj/project.pbxproj | 240 +++++++++++++++++++-- ios/Podfile.lock | 39 ++-- 2 files changed, 240 insertions(+), 39 deletions(-) diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj index c746f1a71270..de0bf9bf28ff 100644 --- a/ios/NewExpensify.xcodeproj/project.pbxproj +++ b/ios/NewExpensify.xcodeproj/project.pbxproj @@ -368,18 +368,120 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipAutomationResources.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipCoreResources.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipExtendedActionsResources.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipMessageCenterResources.bundle", + "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAAutomationActions.plist", + "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAInAppMessageBannerContentView.xib", + "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAInAppMessageBannerView.xib", + "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAInAppMessageButtonView.xib", + "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAInAppMessageFullScreenViewController.xib", + "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAInAppMessageHTMLViewController.xib", + "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAInAppMessageModalViewController.xib", + "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAInAppMessageResizableViewController.xib", + "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAAutomation.xcdatamodeld", + "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAFrequencyLimits.xcdatamodeld", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/UADefaultActions.plist", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/UADefaultActionsTvOS.plist", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/UANativeBridge", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/UANotificationCategories.plist", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/ar.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/cs.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/da.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/de.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/en.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/es-419.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/es.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/fi.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/fr.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/hi.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/hu.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/id.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/it.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/iw.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/ja.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/ko.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/ms.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/nl.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/no.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/pl.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/pt-PT.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/pt.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/ro.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/ru.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/sk.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/sv.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/th.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/tr.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/UAEvents.xcdatamodeld", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/UARemoteData.xcdatamodeld", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/vi.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/zh-Hans.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/zh-Hant.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipExtendedActions/Resources/UAExtendedActions.plist", + "${PODS_ROOT}/Airship/Airship/AirshipExtendedActions/Resources/UARateAppPromptView.xib", + "${PODS_ROOT}/Airship/Airship/AirshipMessageCenter/Resources/UADefaultMessageCenterListViewController.xib", + "${PODS_ROOT}/Airship/Airship/AirshipMessageCenter/Resources/UADefaultMessageCenterMessageViewController.xib", + "${PODS_ROOT}/Airship/Airship/AirshipMessageCenter/Resources/UAMessageCenterActions.plist", + "${PODS_ROOT}/Airship/Airship/AirshipMessageCenter/Resources/UAMessageCenterListCell.xib", + "${PODS_ROOT}/Airship/Airship/AirshipMessageCenter/Resources/UAMessageCenterPlaceholderIcon.png", + "${PODS_ROOT}/Airship/Airship/AirshipMessageCenter/Resources/UAInbox.xcdatamodeld", "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipAutomationResources.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipCoreResources.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipExtendedActionsResources.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipMessageCenterResources.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAAutomationActions.plist", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInAppMessageBannerContentView.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInAppMessageBannerView.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInAppMessageButtonView.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInAppMessageFullScreenViewController.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInAppMessageHTMLViewController.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInAppMessageModalViewController.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInAppMessageResizableViewController.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAAutomation.momd", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAFrequencyLimits.momd", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UADefaultActions.plist", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UADefaultActionsTvOS.plist", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UANativeBridge", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UANotificationCategories.plist", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ar.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/cs.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/da.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/de.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/en.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/es-419.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/es.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/fi.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/fr.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/hi.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/hu.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/id.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/it.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/iw.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ja.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ko.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ms.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/nl.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/no.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/pl.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/pt-PT.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/pt.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ro.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ru.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/sk.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/sv.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/th.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/tr.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAEvents.momd", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UARemoteData.momd", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/vi.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/zh-Hans.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/zh-Hant.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAExtendedActions.plist", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UARateAppPromptView.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UADefaultMessageCenterListViewController.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UADefaultMessageCenterMessageViewController.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAMessageCenterActions.plist", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAMessageCenterListCell.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAMessageCenterPlaceholderIcon.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInbox.momd", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle", ); runOnlyForDeploymentPostprocessing = 0; @@ -455,18 +557,120 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-NewExpensify/Pods-NewExpensify-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipAutomationResources.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipCoreResources.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipExtendedActionsResources.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipMessageCenterResources.bundle", + "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAAutomationActions.plist", + "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAInAppMessageBannerContentView.xib", + "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAInAppMessageBannerView.xib", + "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAInAppMessageButtonView.xib", + "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAInAppMessageFullScreenViewController.xib", + "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAInAppMessageHTMLViewController.xib", + "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAInAppMessageModalViewController.xib", + "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAInAppMessageResizableViewController.xib", + "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAAutomation.xcdatamodeld", + "${PODS_ROOT}/Airship/Airship/AirshipAutomation/Resources/UAFrequencyLimits.xcdatamodeld", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/UADefaultActions.plist", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/UADefaultActionsTvOS.plist", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/UANativeBridge", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/UANotificationCategories.plist", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/ar.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/cs.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/da.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/de.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/en.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/es-419.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/es.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/fi.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/fr.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/hi.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/hu.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/id.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/it.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/iw.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/ja.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/ko.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/ms.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/nl.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/no.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/pl.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/pt-PT.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/pt.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/ro.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/ru.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/sk.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/sv.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/th.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/tr.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/UAEvents.xcdatamodeld", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/UARemoteData.xcdatamodeld", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/vi.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/zh-Hans.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipCore/Resources/zh-Hant.lproj", + "${PODS_ROOT}/Airship/Airship/AirshipExtendedActions/Resources/UAExtendedActions.plist", + "${PODS_ROOT}/Airship/Airship/AirshipExtendedActions/Resources/UARateAppPromptView.xib", + "${PODS_ROOT}/Airship/Airship/AirshipMessageCenter/Resources/UADefaultMessageCenterListViewController.xib", + "${PODS_ROOT}/Airship/Airship/AirshipMessageCenter/Resources/UADefaultMessageCenterMessageViewController.xib", + "${PODS_ROOT}/Airship/Airship/AirshipMessageCenter/Resources/UAMessageCenterActions.plist", + "${PODS_ROOT}/Airship/Airship/AirshipMessageCenter/Resources/UAMessageCenterListCell.xib", + "${PODS_ROOT}/Airship/Airship/AirshipMessageCenter/Resources/UAMessageCenterPlaceholderIcon.png", + "${PODS_ROOT}/Airship/Airship/AirshipMessageCenter/Resources/UAInbox.xcdatamodeld", "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipAutomationResources.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipCoreResources.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipExtendedActionsResources.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipMessageCenterResources.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAAutomationActions.plist", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInAppMessageBannerContentView.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInAppMessageBannerView.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInAppMessageButtonView.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInAppMessageFullScreenViewController.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInAppMessageHTMLViewController.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInAppMessageModalViewController.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInAppMessageResizableViewController.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAAutomation.momd", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAFrequencyLimits.momd", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UADefaultActions.plist", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UADefaultActionsTvOS.plist", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UANativeBridge", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UANotificationCategories.plist", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ar.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/cs.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/da.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/de.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/en.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/es-419.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/es.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/fi.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/fr.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/hi.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/hu.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/id.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/it.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/iw.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ja.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ko.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ms.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/nl.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/no.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/pl.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/pt-PT.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/pt.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ro.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/ru.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/sk.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/sv.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/th.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/tr.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAEvents.momd", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UARemoteData.momd", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/vi.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/zh-Hans.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/zh-Hant.lproj", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAExtendedActions.plist", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UARateAppPromptView.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UADefaultMessageCenterListViewController.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UADefaultMessageCenterMessageViewController.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAMessageCenterActions.plist", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAMessageCenterListCell.nib", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAMessageCenterPlaceholderIcon.png", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UAInbox.momd", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle", ); runOnlyForDeploymentPostprocessing = 0; @@ -736,7 +940,7 @@ COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -797,7 +1001,7 @@ COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; diff --git a/ios/Podfile.lock b/ios/Podfile.lock index f5b2a3244cdc..1aea6abedf1a 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,18 +1,15 @@ PODS: - - Airship (16.4.0): - - Airship/Automation (= 16.4.0) - - Airship/Basement (= 16.4.0) - - Airship/Core (= 16.4.0) - - Airship/ExtendedActions (= 16.4.0) - - Airship/MessageCenter (= 16.4.0) - - Airship/Automation (16.4.0): + - Airship (14.4.2): + - Airship/Automation (= 14.4.2) + - Airship/Core (= 14.4.2) + - Airship/ExtendedActions (= 14.4.2) + - Airship/MessageCenter (= 14.4.2) + - Airship/Automation (14.4.2): - Airship/Core - - Airship/Basement (16.4.0) - - Airship/Core (16.4.0): - - Airship/Basement - - Airship/ExtendedActions (16.4.0): + - Airship/Core (14.4.2) + - Airship/ExtendedActions (14.4.2): - Airship/Core - - Airship/MessageCenter (16.4.0): + - Airship/MessageCenter (14.4.2): - Airship/Core - boost (1.76.0) - CocoaAsyncSocket (7.6.5) @@ -446,7 +443,7 @@ PODS: - React-Core - react-native-document-picker (8.0.0): - React-Core - - react-native-flipper (0.146.1): + - react-native-flipper (0.117.0): - React-Core - react-native-image-picker (4.7.3): - React-Core @@ -534,7 +531,7 @@ PODS: - React-perflogger (= 0.66.4) - rn-fetch-blob (0.12.0): - React-Core - - RNCAsyncStorage (1.17.7): + - RNCAsyncStorage (1.15.5): - React-Core - RNCClipboard (1.5.1): - React-Core @@ -608,8 +605,8 @@ PODS: - SDWebImageWebPCoder (0.8.5): - libwebp (~> 1.0) - SDWebImage/Core (~> 5.10) - - urbanairship-react-native (14.0.0): - - Airship (= 16.4.0) + - urbanairship-react-native (11.0.2): + - Airship (= 14.4.2) - React-Core - Yoga (1.14.0) - YogaKit (1.18.1): @@ -883,7 +880,7 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/yoga" SPEC CHECKSUMS: - Airship: 755b12485ab6001bc846001edf31a9bceb675689 + Airship: 29d674abeac754f783fc46c7d383d6f046687341 boost: a7c83b31436843459a1961bfd74b96033dc77234 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 @@ -941,7 +938,7 @@ SPEC CHECKSUMS: react-native-cameraroll: 60ac50a5209777cbccfe8d7a62d0743a9da87060 react-native-config: 6502b1879f97ed5ac570a029961fc35ea606cd14 react-native-document-picker: 772d04a4bc5c35da9abe27b08ac271420ae3f9ef - react-native-flipper: 4bfe0a324e663f1ae2f76ad0da75673de6895efe + react-native-flipper: cd9eabd8917104c1bbdca2621717cdca3b2addef react-native-image-picker: ae1202414bd5c37c00b2a701daa5b6194a06b7d9 react-native-netinfo: ebbcd8fbe1a0ce7035e43cd18c5a545dcb93dd08 react-native-pdf: 4b5a9e4465a6a3b399e91dc4838eb44ddf716d1f @@ -964,7 +961,7 @@ SPEC CHECKSUMS: React-runtimeexecutor: dec32ee6f2e2a26e13e58152271535fadff5455a ReactCommon: 57b69f6383eafcbd7da625bfa6003810332313c4 rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba - RNCAsyncStorage: 19af8f3e136504e0450e7f85cfb46fc38da87ec9 + RNCAsyncStorage: 8324611026e8dc3706f829953aa6e3899f581589 RNCClipboard: 5e299c6df8e0c98f3d7416b86ae563d3a9f768a3 RNCMaskedView: 138134c4d8a9421b4f2bf39055a79aa05c2d47b1 RNCPicker: f6c760d4b314585ff35165d8640d7917ae30afb1 @@ -982,10 +979,10 @@ SPEC CHECKSUMS: RNSVG: ce9d996113475209013317e48b05c21ee988d42e SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d - urbanairship-react-native: 4e805253e716f01c410ab7614f152d00676bd390 + urbanairship-react-native: 60b4b4235838ff109a2639b639e2ef01d54ad455 Yoga: e7dc4e71caba6472ff48ad7d234389b91dadc280 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: 431123d7514c52fa4516724b89c20d02c87ad8c8 -COCOAPODS: 1.11.3 +COCOAPODS: 1.11.2 From c8aa9fac4c504fa14dfb7c728f6e965886125388 Mon Sep 17 00:00:00 2001 From: Tomas Date: Thu, 11 Aug 2022 10:29:16 +0200 Subject: [PATCH 15/16] Revert "feat: updating npm pkgs for new targetSdkVersion" This reverts commit 0d21e9e8eab057fb47549de2d99e5aeb74333251. --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3850945afb98..452124058579 100644 --- a/package-lock.json +++ b/package-lock.json @@ -48522,9 +48522,9 @@ } }, "urbanairship-react-native": { - "version": "13.0.0", - "resolved": "https://registry.npmjs.org/urbanairship-react-native/-/urbanairship-react-native-13.0.0.tgz", - "integrity": "sha512-lSiVoESDC6NPUdaQETFHRVKoLvf/mlQj3lzKo3cSSCqFoVjaIT7kVgsDutDQ8oBd3okOjSKC7EBkFcrc0sZ1HQ==" + "version": "11.0.2", + "resolved": "https://registry.npmjs.org/urbanairship-react-native/-/urbanairship-react-native-11.0.2.tgz", + "integrity": "sha512-CH5frL9gVAeRFuJm61MC5nAFsfGu9pxT94jQwjtTKqrTlwd/EMoFgYrV1ITuub70MInCD3OFP0FDA3H8YJdZtQ==" }, "uri-js": { "version": "4.4.0", diff --git a/package.json b/package.json index 0eec3d78158c..14782a7aa80c 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "save": "^2.4.0", "shim-keyboard-event-key": "^1.0.3", "underscore": "^1.13.1", - "urbanairship-react-native": "^13.0.0" + "urbanairship-react-native": "^11.0.2" }, "devDependencies": { "@actions/core": "^1.2.6", From 6399644b658172965e0f7395ce3f73b532a6de6d Mon Sep 17 00:00:00 2001 From: Tomas Date: Thu, 11 Aug 2022 10:59:37 +0200 Subject: [PATCH 16/16] fix: set up AndroidManifest.xml for Android 12+ --- android/app/src/main/AndroidManifest.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index c8678771bdbf..5b4e43c86366 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -29,16 +29,16 @@ - + - + @@ -46,7 +46,7 @@ - +