From 3b4ea0bd70a4cd40fb56f9b780608fe471e555fc Mon Sep 17 00:00:00 2001 From: Zhiyuan Zheng Date: Mon, 4 Oct 2021 21:09:26 +0200 Subject: [PATCH] Fix expo publish error --- .github/workflows/build.yml | 2 +- android/app/build.gradle | 2 +- android/gradle.properties | 6 +++++- app.config.ts | 2 +- ios/Podfile | 2 +- ios/Podfile.lock | 26 +------------------------- ios/tooot.xcodeproj/project.pbxproj | 23 ++--------------------- ios/tooot/Supporting/Expo.plist | 2 +- package.json | 2 +- scripts/release.sh | 2 +- 10 files changed, 15 insertions(+), 54 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 696da916..b22afaa7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: with: node-version: 14.x - name: -- Step 3 -- Use Expo action - uses: expo/expo-github-action@v5 + uses: expo/expo-github-action@v6 with: expo-version: 4.x expo-username: ${{ secrets.EXPO_USERNAME }} diff --git a/android/app/build.gradle b/android/app/build.gradle index 69182fd5..23656c7e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -78,7 +78,7 @@ import com.android.build.OutputFile */ project.ext.react = [ - enableHermes: true + enableHermes: (findProperty('expo.jsEngine') ?: "jsc") == "hermes" ] apply from: '../../node_modules/react-native-unimodules/gradle.groovy' diff --git a/android/gradle.properties b/android/gradle.properties index 2ac55671..f249bc98 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -31,4 +31,8 @@ FLIPPER_VERSION=0.75.1 org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=4096m -XX:+HeapDumpOnOutOfMemoryError org.gradle.daemon=true org.gradle.parallel=true -org.gradle.configureondemand=true \ No newline at end of file +org.gradle.configureondemand=true + +# The hosted JavaScript engine +# Supported values: expo.jsEngine = "hermes" | "jsc" +expo.jsEngine=hermes \ No newline at end of file diff --git a/app.config.ts b/app.config.ts index 6344887b..9de1facb 100644 --- a/app.config.ts +++ b/app.config.ts @@ -34,7 +34,7 @@ export default (): ExpoConfig => ({ bundleIdentifier: 'com.xmflsct.app.tooot' }, android: { - versionCode: 4, + jsEngine: 'hermes', package: 'com.xmflsct.app.tooot', googleServicesFile: './configs/google-services.json', permissions: ['CAMERA', 'VIBRATE'] diff --git a/ios/Podfile b/ios/Podfile index db4de4cc..dd6f31a0 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -11,7 +11,7 @@ target 'tooot' do use_react_native!( :path => config[:reactNativePath], # to enable hermes on iOS, change `false` to `true` and then install pods - :hermes_enabled => true + :hermes_enabled => false ) # Enables Flipper. diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 396a29d1..2974ea51 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -149,8 +149,6 @@ PODS: - GoogleUtilities/Logger - GoogleUtilities/UserDefaults (7.5.1): - GoogleUtilities/Logger - - hermes-engine (0.7.2) - - libevent (2.1.12) - libwebp (1.2.0): - libwebp/demux (= 1.2.0) - libwebp/mux (= 1.2.0) @@ -175,11 +173,6 @@ PODS: - boost-for-react-native - DoubleConversion - glog - - RCT-Folly/Futures (2020.01.13.00): - - boost-for-react-native - - DoubleConversion - - glog - - libevent - RCTRequired (0.64.2) - RCTTypeSafety (0.64.2): - FBLazyVector (= 0.64.2) @@ -237,16 +230,6 @@ PODS: - React-jsinspector (= 0.64.2) - React-perflogger (= 0.64.2) - Yoga - - React-Core/Hermes (0.64.2): - - glog - - hermes-engine - - RCT-Folly (= 2020.01.13.00) - - RCT-Folly/Futures - - React-cxxreact (= 0.64.2) - - React-jsi (= 0.64.2) - - React-jsiexecutor (= 0.64.2) - - React-perflogger (= 0.64.2) - - Yoga - React-Core/RCTActionSheetHeaders (0.64.2): - glog - RCT-Folly (= 2020.01.13.00) @@ -550,8 +533,6 @@ DEPENDENCIES: - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - - hermes-engine (~> 0.7.2) - - libevent (~> 2.1.12) - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`) @@ -559,7 +540,6 @@ DEPENDENCIES: - React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`) - React-Core (from `../node_modules/react-native/`) - React-Core/DevSupport (from `../node_modules/react-native/`) - - React-Core/Hermes (from `../node_modules/react-native/`) - React-Core/RCTWebSocket (from `../node_modules/react-native/`) - React-CoreModules (from `../node_modules/react-native/React/CoreModules`) - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`) @@ -609,8 +589,6 @@ SPEC REPOS: - GoogleAppMeasurement - GoogleDataTransport - GoogleUtilities - - hermes-engine - - libevent - libwebp - nanopb - PromisesObjC @@ -813,8 +791,6 @@ SPEC CHECKSUMS: GoogleAppMeasurement: 0c3b134b2c0a90c4c24833873894bfe0e42a0384 GoogleDataTransport: 8b0e733ea77c9218778e5a9e34ba9508b8328939 GoogleUtilities: 3df19e3c24f7bbc291d8b5809aa6b0d41e642437 - hermes-engine: 7d97ba46a1e29bacf3e3c61ecb2804a5ddd02d4f - libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 libwebp: e90b9c01d99205d03b6bb8f2c8c415e5a4ef66f0 nanopb: 59221d7f958fb711001e6a449489542d92ae113e PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97 @@ -864,6 +840,6 @@ SPEC CHECKSUMS: UMTaskManagerInterface: 2be431101b73604e64fbfffcf759336f9d8fccbb Yoga: 575c581c63e0d35c9a83f4b46d01d63abc1100ac -PODFILE CHECKSUM: 34cad1fa3f14caa5b138177b6379ac2cba0e1087 +PODFILE CHECKSUM: ef8b50a8ef67c2c3062d4beeb7172184208da350 COCOAPODS: 1.11.2 diff --git a/ios/tooot.xcodeproj/project.pbxproj b/ios/tooot.xcodeproj/project.pbxproj index 0e2771ea..34838708 100644 --- a/ios/tooot.xcodeproj/project.pbxproj +++ b/ios/tooot.xcodeproj/project.pbxproj @@ -148,7 +148,6 @@ 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, 800E24972A6A228C8D4807E9 /* [CP] Copy Pods Resources */, - 5C5B41FC5F9DBE367CF7EF21 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -247,24 +246,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 5C5B41FC5F9DBE367CF7EF21 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-tooot/Pods-tooot-frameworks.sh", - "${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/iphoneos/hermes.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-tooot/Pods-tooot-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 800E24972A6A228C8D4807E9 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -438,7 +419,7 @@ COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386"; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 "; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -500,7 +481,7 @@ COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386"; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 "; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; diff --git a/ios/tooot/Supporting/Expo.plist b/ios/tooot/Supporting/Expo.plist index 51168cbe..bba13d22 100644 --- a/ios/tooot/Supporting/Expo.plist +++ b/ios/tooot/Supporting/Expo.plist @@ -11,7 +11,7 @@ EXUpdatesReleaseChannel 0-development EXUpdatesSDKVersion - 40.0.0 + 0 EXUpdatesURL https://exp.host/@xmflsct/tooot diff --git a/package.json b/package.json index b4e70e58..bc35c345 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "major": 2, "minor": 2, "patch": 0, - "expo": "41.0.0" + "expo": "42.0.0" }, "description": "tooot app for Mastodon", "author": "xmflsct ", diff --git a/scripts/release.sh b/scripts/release.sh index 8ba2bfd1..b7534c7e 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -5,4 +5,4 @@ if [ $# -ne 1 ]; then exit 1 fi -expo publish --target bare --release-channel=$1 \ No newline at end of file +expo publish --quiet --target bare --release-channel=$1 \ No newline at end of file