From 29e9d24542491107afdc8dab51e2cbee7e8c52aa Mon Sep 17 00:00:00 2001 From: xmflsct Date: Wed, 21 Sep 2022 09:55:27 +0200 Subject: [PATCH 1/2] Bring back expo-updates as a dependency to sentry-expo But disabled --- android/app/src/main/AndroidManifest.xml | 2 + ios/Podfile.lock | 42 ++++++++++++++++++++ ios/tooot.xcodeproj/project.pbxproj | 2 + ios/tooot/Supporting/Expo.plist | 10 +++++ package.json | 3 +- yarn.lock | 49 +++++++++++++++++++++++- 6 files changed, 105 insertions(+), 3 deletions(-) create mode 100644 ios/tooot/Supporting/Expo.plist diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 85aa5430..d9f10fd7 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -13,6 +13,8 @@ + + diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 9b5aea0b..6dd27bfc 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,6 +1,9 @@ PODS: + - ASN1Decoder (1.8.0) - boost (1.76.0) - DoubleConversion (1.1.6) + - EASClient (0.3.0): + - ExpoModulesCore - EXApplication (4.2.2): - ExpoModulesCore - EXAV (12.0.4): @@ -24,6 +27,9 @@ PODS: - Firebase/Core (= 8.14.0) - EXFont (10.2.0): - ExpoModulesCore + - EXJSONUtils (0.3.0) + - EXManifests (0.3.1): + - EXJSONUtils - EXNotifications (0.16.1): - ExpoModulesCore - Expo (46.0.8): @@ -52,6 +58,16 @@ PODS: - React-Core - EXStoreReview (5.3.0): - ExpoModulesCore + - EXStructuredHeaders (2.2.1) + - EXUpdates (0.14.5): + - ASN1Decoder (~> 1.8) + - EASClient + - EXManifests + - ExpoModulesCore + - EXStructuredHeaders + - EXUpdatesInterface + - React-Core + - EXUpdatesInterface (0.7.0) - EXVideoThumbnails (6.4.0): - ExpoModulesCore - FBLazyVector (0.69.4) @@ -573,6 +589,7 @@ PODS: DEPENDENCIES: - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`) - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) + - EASClient (from `../node_modules/expo-eas-client/ios`) - EXApplication (from `../node_modules/expo-application/ios`) - EXAV (from `../node_modules/expo-av/ios`) - EXConstants (from `../node_modules/expo-constants/ios`) @@ -582,6 +599,8 @@ DEPENDENCIES: - EXFirebaseAnalytics (from `../node_modules/expo-firebase-analytics/ios`) - EXFirebaseCore (from `../node_modules/expo-firebase-core/ios`) - EXFont (from `../node_modules/expo-font/ios`) + - EXJSONUtils (from `../node_modules/expo-json-utils/ios`) + - EXManifests (from `../node_modules/expo-manifests/ios`) - EXNotifications (from `../node_modules/expo-notifications/ios`) - Expo (from `../node_modules/expo`) - ExpoCrypto (from `../node_modules/expo-crypto/ios`) @@ -595,6 +614,9 @@ DEPENDENCIES: - EXSecureStore (from `../node_modules/expo-secure-store/ios`) - EXSplashScreen (from `../node_modules/expo-splash-screen/ios`) - EXStoreReview (from `../node_modules/expo-store-review/ios`) + - EXStructuredHeaders (from `../node_modules/expo-structured-headers/ios`) + - EXUpdates (from `../node_modules/expo-updates/ios`) + - EXUpdatesInterface (from `../node_modules/expo-updates-interface/ios`) - EXVideoThumbnails (from `../node_modules/expo-video-thumbnails/ios`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`) @@ -653,6 +675,7 @@ DEPENDENCIES: SPEC REPOS: trunk: + - ASN1Decoder - Firebase - FirebaseAnalytics - FirebaseCore @@ -676,6 +699,8 @@ EXTERNAL SOURCES: :podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec" DoubleConversion: :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec" + EASClient: + :path: "../node_modules/expo-eas-client/ios" EXApplication: :path: "../node_modules/expo-application/ios" EXAV: @@ -694,6 +719,10 @@ EXTERNAL SOURCES: :path: "../node_modules/expo-firebase-core/ios" EXFont: :path: "../node_modules/expo-font/ios" + EXJSONUtils: + :path: "../node_modules/expo-json-utils/ios" + EXManifests: + :path: "../node_modules/expo-manifests/ios" EXNotifications: :path: "../node_modules/expo-notifications/ios" Expo: @@ -720,6 +749,12 @@ EXTERNAL SOURCES: :path: "../node_modules/expo-splash-screen/ios" EXStoreReview: :path: "../node_modules/expo-store-review/ios" + EXStructuredHeaders: + :path: "../node_modules/expo-structured-headers/ios" + EXUpdates: + :path: "../node_modules/expo-updates/ios" + EXUpdatesInterface: + :path: "../node_modules/expo-updates-interface/ios" EXVideoThumbnails: :path: "../node_modules/expo-video-thumbnails/ios" FBLazyVector: @@ -828,8 +863,10 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/yoga" SPEC CHECKSUMS: + ASN1Decoder: 6110fdeacfdb41559b1481457a1645be716610aa boost: a7c83b31436843459a1961bfd74b96033dc77234 DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 + EASClient: a2581835cf9b97d0defd5d630fc6eb1bf77045e7 EXApplication: e418d737a036e788510f2c4ad6c10a7d54d18586 EXAV: 596506c9bee54ad52f2f3b625cdaeb9d9f2dd6b7 EXConstants: 75c40827af38bd6bfcf69f880a5b45037eeff9c9 @@ -839,6 +876,8 @@ SPEC CHECKSUMS: EXFirebaseAnalytics: 15c5f2d5bae6668ecb1104f98b2b74a2d9fd3740 EXFirebaseCore: 9ee5a9691a8480f0fbaeb7f3cd135f256d436fdf EXFont: a5d80bd9b3452b2d5abbce2487da89b0150e6487 + EXJSONUtils: 2a74b8f40f1523cc3f92af99c91aa78201737a77 + EXManifests: b38dc61303f5eede990b4c8ecbfac32f82160e65 EXNotifications: 9a2aa201deb19dfe1dbe0e370eeb2922de0d2422 Expo: 2322364db3fe1adaa179787edb7e1bc6e5159c78 ExpoCrypto: e534314db0e1a17ae12b5140d529bd0c5efcbc6a @@ -852,6 +891,9 @@ SPEC CHECKSUMS: EXSecureStore: ac4b3c89dd5810528074d9422d5fed5a9e684467 EXSplashScreen: 31ab6df6d23e97e074d1330224741979943f1d82 EXStoreReview: cbb6b2202bb6f831cd3234d9d8b995cec0eb32f2 + EXStructuredHeaders: 5d86829469399370a9fc7cb1e4391b09de87681d + EXUpdates: 664f999db423f90f3fb3d91edcda9bc28cb5a5b4 + EXUpdatesInterface: 2bbc11815dfa2ec3fc02e5534c7592c6b42b5327 EXVideoThumbnails: 486533e1a66c9859f9b9e3b2e1f9f0b275515b48 FBLazyVector: c71b8c429a8af2aff1013934a7152e9d9d0c937d FBReactNativeSpec: cb0df4f0084281b394f76bb9b4d1d9540f35963f diff --git a/ios/tooot.xcodeproj/project.pbxproj b/ios/tooot.xcodeproj/project.pbxproj index e74e5f11..7bca145e 100644 --- a/ios/tooot.xcodeproj/project.pbxproj +++ b/ios/tooot.xcodeproj/project.pbxproj @@ -391,11 +391,13 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-tooot/Pods-tooot-resources.sh", "${PODS_CONFIGURATION_BUILD_DIR}/EXConstants/EXConstants.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/EXUpdates/EXUpdates.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXConstants.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EXUpdates.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle", ); runOnlyForDeploymentPostprocessing = 0; diff --git a/ios/tooot/Supporting/Expo.plist b/ios/tooot/Supporting/Expo.plist new file mode 100644 index 00000000..7943c9a6 --- /dev/null +++ b/ios/tooot/Supporting/Expo.plist @@ -0,0 +1,10 @@ + + + + + EXUpdatesAutoSetup + + EXUpdatesEnabled + + + \ No newline at end of file diff --git a/package.json b/package.json index ef7c7644..717f85a2 100644 --- a/package.json +++ b/package.json @@ -58,6 +58,7 @@ "expo-secure-store": "^11.3.0", "expo-splash-screen": "^0.16.1", "expo-store-review": "^5.3.0", + "expo-updates": "^0.14.5", "expo-video-thumbnails": "^6.4.0", "expo-web-browser": "^11.0.0", "i18next": "^21.9.1", @@ -122,4 +123,4 @@ "react-native-clean-project": "^4.0.1", "typescript": "^4.7.4" } -} \ No newline at end of file +} diff --git a/yarn.lock b/yarn.lock index 352d9a7a..68287a68 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1170,7 +1170,7 @@ uuid "^3.4.0" wrap-ansi "^7.0.0" -"@expo/code-signing-certificates@^0.0.2": +"@expo/code-signing-certificates@0.0.2", "@expo/code-signing-certificates@^0.0.2": version "0.0.2" resolved "https://registry.yarnpkg.com/@expo/code-signing-certificates/-/code-signing-certificates-0.0.2.tgz#65cd615800e6724b54831c966dd1a90145017246" integrity sha512-vnPHFjwOqxQ1VLztktY+fYCfwvLzjqpzKn09rchcQE7Sdf0wtW5fFtIZBEFOOY5wasp8tXSnp627zrAwazPHzg== @@ -1316,7 +1316,7 @@ json5 "^1.0.1" write-file-atomic "^2.3.0" -"@expo/metro-config@~0.3.18": +"@expo/metro-config@~0.3.18", "@expo/metro-config@~0.3.19": version "0.3.22" resolved "https://registry.yarnpkg.com/@expo/metro-config/-/metro-config-0.3.22.tgz#fa4a0729ec8ecbc9c9fb79c63ecc66a299505c82" integrity sha512-R81sLbaeUBjN8IXcxiVx7GcpSj8z7szILl1b5yJDb38WdIFwxhrseA5wXaTT1yMhI+59w6n99T2qtFV2yD5qYA== @@ -3949,6 +3949,11 @@ expo-device@^4.3.0: dependencies: ua-parser-js "^0.7.19" +expo-eas-client@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/expo-eas-client/-/expo-eas-client-0.3.0.tgz#21383fc95a52e71e13c7276456db20388fefcf95" + integrity sha512-dBD00lJ629ayh5abbmgn6I1Z5NOaWM1iea2ODLd/EF1ZcS1P3yiPm6blpvL/tD+uewL8gxxmla/Ac+SiDdYAYA== + expo-error-recovery@~3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/expo-error-recovery/-/expo-error-recovery-3.2.0.tgz#3a4543382904a5e70829cb41d7fc0f022c2bef6e" @@ -3988,6 +3993,11 @@ expo-haptics@^11.3.0: resolved "https://registry.yarnpkg.com/expo-haptics/-/expo-haptics-11.3.0.tgz#74283bd212a86f16ff2d6b0125e2a9604c940523" integrity sha512-mQYSZsJ7LcdM2b8JecrV2qEw9ymNzGleS/+bpufdHZ+n5tCnWZXiMvZFFczaExHfaeGY3nGQvH1RjEOFIXSfig== +expo-json-utils@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/expo-json-utils/-/expo-json-utils-0.3.0.tgz#0c4a0195ee2bbde02cbb5f4d384d1cb63bea7493" + integrity sha512-ceo0pWFJqRAsNjZWX3rVDhy+NDzmrBNFOdvW+HE4EHqlt+OEUu9INIYKO8fU+g3ifI0VcKqHfvvj5wKsSpvPBw== + expo-keep-awake@~10.2.0: version "10.2.0" resolved "https://registry.yarnpkg.com/expo-keep-awake/-/expo-keep-awake-10.2.0.tgz#46f04740bccd321732bbbed93491e2076d5dbbd7" @@ -4011,6 +4021,13 @@ expo-localization@^13.1.0: dependencies: rtl-detect "^1.0.2" +expo-manifests@~0.3.0: + version "0.3.1" + resolved "https://registry.yarnpkg.com/expo-manifests/-/expo-manifests-0.3.1.tgz#52c3ef41d3b1958039be0434363e6499c773aaf6" + integrity sha512-zv2a4pzhbvxVjrTO4XEiP5THt4RwtxyJjfixFhDNfHtDQR7fS4h9sZSGX9ind+IS5SQJQ2ykfVAi8xnwP6zHaw== + dependencies: + expo-json-utils "~0.3.0" + expo-modules-autolinking@0.10.2: version "0.10.2" resolved "https://registry.yarnpkg.com/expo-modules-autolinking/-/expo-modules-autolinking-0.10.2.tgz#9a6cdc0f187da4663607b719dcf400402cc5b776" @@ -4076,6 +4093,34 @@ expo-store-review@^5.3.0: resolved "https://registry.yarnpkg.com/expo-store-review/-/expo-store-review-5.3.0.tgz#f8b1253a607b13e548889a442d8ee7bb0fa025a3" integrity sha512-abWgsgXnfeJnAINOVGWxFC0HXizZxBoxNZoekswqW2AtsQ6DR5nvWj5VyovVjd8DktRG/ly1ZKJwP0KNXqWffw== +expo-structured-headers@~2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/expo-structured-headers/-/expo-structured-headers-2.2.1.tgz#739f969101de6bead921eee59e5899399ad67715" + integrity sha512-nY6GuvoS/U5XdhfBNmvXGRoGzIXywXpSZs2wdiP+FbS79P9UWyEqzgARrBTF+6pQxUVMs6/vdffxRpwhjwYPug== + +expo-updates-interface@~0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/expo-updates-interface/-/expo-updates-interface-0.7.0.tgz#f4f03b61dbdd949cac9fb44e250e1162ba177650" + integrity sha512-saThnbrYDSjKxfMFFguAvh5o5KGabvAOHItkJRwq2L3c0T/3q26Q0kM83880h/+TTtAVsl1+Vhny9d+ImD3yvQ== + +expo-updates@^0.14.5: + version "0.14.5" + resolved "https://registry.yarnpkg.com/expo-updates/-/expo-updates-0.14.5.tgz#3de2764b143c93eee636cab538c081a7867aa086" + integrity sha512-m6IOiETTwsJhL93meHG/Y3FWuaRQIbn9LJ5wpWurQ7RniqIV9Ae61SRmJJyYtxk1qLy/dKJ/jHyF1xp8PKIlnQ== + dependencies: + "@expo/code-signing-certificates" "0.0.2" + "@expo/config" "~7.0.1" + "@expo/config-plugins" "~5.0.1" + "@expo/metro-config" "~0.3.19" + arg "4.1.0" + expo-eas-client "~0.3.0" + expo-manifests "~0.3.0" + expo-structured-headers "~2.2.0" + expo-updates-interface "~0.7.0" + fbemitter "^3.0.0" + resolve-from "^5.0.0" + uuid "^3.4.0" + expo-video-thumbnails@^6.4.0: version "6.4.0" resolved "https://registry.yarnpkg.com/expo-video-thumbnails/-/expo-video-thumbnails-6.4.0.tgz#59603af06c1d2122c2f7db854562236bbd8319ec" From 838dfdb4a3e35b412bd0ba2278d60bd99da4a45f Mon Sep 17 00:00:00 2001 From: xmflsct Date: Wed, 21 Sep 2022 10:00:32 +0200 Subject: [PATCH 2/2] Bump SDWebImage --- ios/Podfile.lock | 34 ++++++++++---------- patches/react-native-fast-image+8.5.11.patch | 4 +-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 6dd27bfc..28466906 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -141,24 +141,24 @@ PODS: - GoogleUtilities/Environment (~> 7.7) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/AppDelegateSwizzler (7.7.0): + - GoogleUtilities/AppDelegateSwizzler (7.8.0): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (7.7.0): + - GoogleUtilities/Environment (7.8.0): - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.7.0): + - GoogleUtilities/Logger (7.8.0): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (7.7.0): + - GoogleUtilities/MethodSwizzler (7.8.0): - GoogleUtilities/Logger - - GoogleUtilities/Network (7.7.0): + - GoogleUtilities/Network (7.8.0): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (7.7.0)" - - GoogleUtilities/Reachability (7.7.0): + - "GoogleUtilities/NSData+zlib (7.8.0)" + - GoogleUtilities/Reachability (7.8.0): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (7.7.0): + - GoogleUtilities/UserDefaults (7.8.0): - GoogleUtilities/Logger - hermes-engine (0.69.4) - libevent (2.1.12) @@ -533,7 +533,7 @@ PODS: - React-Core - RNFastImage (8.5.11): - React-Core - - SDWebImage (~> 5.13.2) + - SDWebImage (~> 5.13.3) - SDWebImageWebPCoder (~> 0.9.0) - RNGestureHandler (2.5.0): - React-Core @@ -574,10 +574,10 @@ PODS: - React - RNSVG (13.0.0): - React-Core - - SDWebImage (5.13.2): - - SDWebImage/Core (= 5.13.2) - - SDWebImage/Core (5.13.2) - - SDWebImageWebPCoder (0.9.0): + - SDWebImage (5.13.3): + - SDWebImage/Core (= 5.13.3) + - SDWebImage/Core (5.13.3) + - SDWebImageWebPCoder (0.9.1): - libwebp (~> 1.0) - SDWebImage/Core (~> 5.13) - Sentry (7.23.0): @@ -906,7 +906,7 @@ SPEC CHECKSUMS: glog: 3d02b25ca00c2d456734d0bcff864cbc62f6ae1a GoogleAppMeasurement: 71156240babd3cc6ced03e0d54816f01a880c730 GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f - GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1 + GoogleUtilities: 1d20a6ad97ef46f67bbdec158ce00563a671ebb7 hermes-engine: 761a544537e62df2a37189389b9d2654dc1f75af libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 libwebp: 60305b2e989864154bd9be3d772730f08fc6a59c @@ -952,15 +952,15 @@ SPEC CHECKSUMS: ReactCommon: 8f67bd7e0a6afade0f20718f859dc8c2275f2e83 RNCAsyncStorage: b2489b49e38c85e10ed45a888d13a2a4c7b32ea1 RNCClipboard: f1736c75ab85b627a4d57587edb4b60999c4dd80 - RNFastImage: 8e9b5b9e6df94d2e359c0a75a4745ad1311506fd + RNFastImage: d2efd2a7c06f15141b2c4116f7c0f14ee429f458 RNGestureHandler: bad495418bcbd3ab47017a38d93d290ebd406f50 RNReanimated: 2cf7451318bb9cc430abeec8d67693f9cf4e039c RNScreens: ee31ecdf23fe81e93c74feaa086cf173d758ab58 RNSentry: 7495ba091f09f12902d8cf916024efd99b058efe RNShareMenu: cb9dac548c8bf147d06f0bf07296ad51ea9f5fc3 RNSVG: 42a0c731b11179ebbd27a3eeeafa7201ebb476ff - SDWebImage: 72f86271a6f3139cc7e4a89220946489d4b9a866 - SDWebImageWebPCoder: 3dc350894112feab5375cfba9ce0986544a66a69 + SDWebImage: af5bbffef2cde09f148d826f9733dcde1a9414cd + SDWebImageWebPCoder: 18503de6621dd2c420d680e33d46bf8e1d5169b0 Sentry: a0d4563fa4ddacba31fdcc35daaa8573d87224d6 Swime: d7b2c277503b6cea317774aedc2dce05613f8b0b Yoga: ff994563b2fd98c982ca58e8cd9db2cdaf4dda74 diff --git a/patches/react-native-fast-image+8.5.11.patch b/patches/react-native-fast-image+8.5.11.patch index a2347146..1fdc8dc2 100644 --- a/patches/react-native-fast-image+8.5.11.patch +++ b/patches/react-native-fast-image+8.5.11.patch @@ -1,5 +1,5 @@ diff --git a/node_modules/react-native-fast-image/RNFastImage.podspec b/node_modules/react-native-fast-image/RNFastImage.podspec -index db0fada..9379119 100644 +index db0fada..a869641 100644 --- a/node_modules/react-native-fast-image/RNFastImage.podspec +++ b/node_modules/react-native-fast-image/RNFastImage.podspec @@ -16,6 +16,6 @@ Pod::Spec.new do |s| @@ -8,7 +8,7 @@ index db0fada..9379119 100644 s.dependency 'React-Core' - s.dependency 'SDWebImage', '~> 5.11.1' - s.dependency 'SDWebImageWebPCoder', '~> 0.8.4' -+ s.dependency 'SDWebImage', '~> 5.13.2' ++ s.dependency 'SDWebImage', '~> 5.13.3' + s.dependency 'SDWebImageWebPCoder', '~> 0.9.0' end diff --git a/node_modules/react-native-fast-image/android/build.gradle b/node_modules/react-native-fast-image/android/build.gradle