From 2b84dd5a3691010d18ff00ebbbb5bbae362d22ed Mon Sep 17 00:00:00 2001 From: xmflsct Date: Wed, 17 Aug 2022 00:00:33 +0200 Subject: [PATCH 1/2] Fix expo building --- .github/workflows/build.yml | 2 +- ios/Podfile | 4 ++-- ios/Podfile.properties.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 53d4014b..edf2356c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -122,5 +122,5 @@ jobs: FL_GITHUB_RELEASE_API_BEARER: ${{ secrets.GITHUB_TOKEN }} run: yarn app:build release - name: -- Step 8 -- Publish expo update - run: eas update --non-interactive --auto + run: eas update --auto diff --git a/ios/Podfile b/ios/Podfile index 7adb048d..8aa6f59a 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -20,7 +20,7 @@ target 'tooot' do use_react_native!( :path => config[:reactNativePath], :production => production, - :hermes_enabled => podfile_properties['jsEngine'] == 'hermes', + :hermes_enabled => podfile_properties['expo.jsEngine'] == 'hermes', :fabric_enabled => flags[:fabric_enabled], :flipper_configuration => FlipperConfiguration.disabled, # An absolute path to your application root. @@ -51,7 +51,7 @@ end target 'ShareExtension' do use_react_native!( :production => production, - :hermes_enabled => podfile_properties['jsEngine'] == 'hermes', + :hermes_enabled => podfile_properties['expo.jsEngine'] == 'hermes', :flipper_configuration => FlipperConfiguration.disabled ) diff --git a/ios/Podfile.properties.json b/ios/Podfile.properties.json index 484dd29a..b1bd45da 100644 --- a/ios/Podfile.properties.json +++ b/ios/Podfile.properties.json @@ -1,3 +1,3 @@ { - "jsEngine": "hermes" + "expo.jsEngine": "hermes" } From 3e9585fcb7682372919808f64a31287d6d49b834 Mon Sep 17 00:00:00 2001 From: xmflsct Date: Wed, 17 Aug 2022 01:01:03 +0200 Subject: [PATCH 2/2] Removed forced autolinking --- ios/Podfile.lock | 20 +++++++++++++++++++- package.json | 22 ---------------------- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index d019c1bc..ec26e984 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -4,6 +4,8 @@ PODS: - DoubleConversion (1.1.6) - EASClient (0.3.0): - ExpoModulesCore + - EXApplication (4.2.2): + - ExpoModulesCore - EXAV (12.0.4): - ExpoModulesCore - React-runtimeexecutor @@ -23,6 +25,8 @@ PODS: - EXFirebaseCore (5.1.1): - ExpoModulesCore - Firebase/Core (= 8.14.0) + - EXFont (10.2.0): + - ExpoModulesCore - EXJSONUtils (0.3.0) - EXManifests (0.3.1): - EXJSONUtils @@ -34,6 +38,8 @@ PODS: - ExpoModulesCore - ExpoHaptics (11.3.0): - ExpoModulesCore + - ExpoKeepAwake (10.2.0): + - ExpoModulesCore - ExpoLocalization (13.1.0): - ExpoModulesCore - ExpoModulesCore (0.11.3): @@ -584,6 +590,7 @@ 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`) - EXDevice (from `../node_modules/expo-device/ios`) @@ -591,12 +598,14 @@ DEPENDENCIES: - EXFileSystem (from `../node_modules/expo-file-system/ios`) - 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`) - ExpoHaptics (from `../node_modules/expo-haptics/ios`) + - ExpoKeepAwake (from `../node_modules/expo-keep-awake/ios`) - ExpoLocalization (from `../node_modules/expo-localization/ios`) - ExpoModulesCore (from `../node_modules/expo-modules-core/ios`) - ExpoRandom (from `../node_modules/expo-random/ios`) @@ -692,6 +701,8 @@ EXTERNAL SOURCES: :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: :path: "../node_modules/expo-av/ios" EXConstants: @@ -706,6 +717,8 @@ EXTERNAL SOURCES: :path: "../node_modules/expo-firebase-analytics/ios" EXFirebaseCore: :path: "../node_modules/expo-firebase-core/ios" + EXFont: + :path: "../node_modules/expo-font/ios" EXJSONUtils: :path: "../node_modules/expo-json-utils/ios" EXManifests: @@ -718,6 +731,8 @@ EXTERNAL SOURCES: :path: "../node_modules/expo-crypto/ios" ExpoHaptics: :path: "../node_modules/expo-haptics/ios" + ExpoKeepAwake: + :path: "../node_modules/expo-keep-awake/ios" ExpoLocalization: :path: "../node_modules/expo-localization/ios" ExpoModulesCore: @@ -852,6 +867,7 @@ SPEC CHECKSUMS: boost: a7c83b31436843459a1961bfd74b96033dc77234 DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 EASClient: a2581835cf9b97d0defd5d630fc6eb1bf77045e7 + EXApplication: e418d737a036e788510f2c4ad6c10a7d54d18586 EXAV: 596506c9bee54ad52f2f3b625cdaeb9d9f2dd6b7 EXConstants: 75c40827af38bd6bfcf69f880a5b45037eeff9c9 EXDevice: 7647ca9b1fd8b269dfd896a7643d659343358054 @@ -859,12 +875,14 @@ SPEC CHECKSUMS: EXFileSystem: 927e0a8885aa9c49e50fc38eaba2c2389f2f1019 EXFirebaseAnalytics: 15c5f2d5bae6668ecb1104f98b2b74a2d9fd3740 EXFirebaseCore: 9ee5a9691a8480f0fbaeb7f3cd135f256d436fdf + EXFont: a5d80bd9b3452b2d5abbce2487da89b0150e6487 EXJSONUtils: 2a74b8f40f1523cc3f92af99c91aa78201737a77 EXManifests: b38dc61303f5eede990b4c8ecbfac32f82160e65 EXNotifications: 9a2aa201deb19dfe1dbe0e370eeb2922de0d2422 Expo: 8cb51419dfec611e6125e09384669eb71d3c4c6d ExpoCrypto: e534314db0e1a17ae12b5140d529bd0c5efcbc6a ExpoHaptics: efe9e68e9dfe0d15c183c0c70a25f3874124ab9e + ExpoKeepAwake: 0e8f18142e71bbf2c7f6aa66ebed249ba1420320 ExpoLocalization: 63204f4b9d4f653469d266332ceaa6c6ac8a305d ExpoModulesCore: 8303cc952788be09fc6eab62815d257016ae6dec ExpoRandom: f9f1faa299a40733867f344d6b7bfa2d1f4ab04d @@ -947,6 +965,6 @@ SPEC CHECKSUMS: Swime: d7b2c277503b6cea317774aedc2dce05613f8b0b Yoga: ff994563b2fd98c982ca58e8cd9db2cdaf4dda74 -PODFILE CHECKSUM: 87f71ca2771d16ab3648db0569a7eb066517134c +PODFILE CHECKSUM: 1bdd264ade2cc3cb3c6ac518ee1cb89d04e7a9ac COCOAPODS: 1.11.3 diff --git a/package.json b/package.json index fee50e10..b207fb2d 100644 --- a/package.json +++ b/package.json @@ -123,27 +123,5 @@ "postinstall-postinstall": "^2.1.0", "react-native-clean-project": "^4.0.1", "typescript": "^4.7.4" - }, - "expo": { - "autolinking": { - "ios": { - "exclude": [ - "expo-application", - "expo-font", - "expo-keep-awake" - ] - }, - "android": { - "exclude": [ - "expo-application", - "expo-firebase-analytics", - "expo-firebase-core", - "expo-font", - "expo-keep-awake", - "expo-store-review", - "react-native-reanimated" - ] - } - } } } \ No newline at end of file