diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj index e9fbab1133e4..9f605a676389 100644 --- a/ios/NewExpensify.xcodeproj/project.pbxproj +++ b/ios/NewExpensify.xcodeproj/project.pbxproj @@ -15,7 +15,6 @@ 0CDA8E37287DD6A0004ECBEC /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0CDA8E36287DD6A0004ECBEC /* Images.xcassets */; }; 0DFC45942C884E0A00B56C91 /* RCTShortcutManagerModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 0DFC45932C884E0A00B56C91 /* RCTShortcutManagerModule.m */; }; 0F5E5350263B73FD004CA14F /* EnvironmentChecker.m in Sources */ = {isa = PBXBuildFile; fileRef = 0F5E534F263B73FD004CA14F /* EnvironmentChecker.m */; }; - 0F749C2B3B8F4562B816DEAB /* BuildFile in Resources */ = {isa = PBXBuildFile; }; 1246A3EF20E54E7A9494C8B9 /* ExpensifyNeue-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = F4F8A052A22040339996324B /* ExpensifyNeue-Regular.otf */; }; 18D050E0262400AF000D658B /* BridgingFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18D050DF262400AF000D658B /* BridgingFile.swift */; }; 1F7170E8E7867C00D32F03FE /* Pods_NotificationServiceExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4521D653AC9D36713686E739 /* Pods_NotificationServiceExtension.framework */; }; @@ -502,7 +501,6 @@ 1246A3EF20E54E7A9494C8B9 /* ExpensifyNeue-Regular.otf in Resources */, D27CE6B77196EF3EF450EEAC /* PrivacyInfo.xcprivacy in Resources */, 524F95D57E75496EBD14B0AA /* ExpensifyMono-BoldItalic.otf in Resources */, - 0F749C2B3B8F4562B816DEAB /* BuildFile in Resources */, 59164B2F48344A53975791A9 /* CustomEmojiNativeFont.ttf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -787,7 +785,6 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [[ -f \"$PODS_ROOT/../.xcode.env\" ]]; then\n source \"$PODS_ROOT/../.xcode.env\"\nfi\nif [[ -f \"$PODS_ROOT/../.xcode.env.local\" ]]; then\n source \"$PODS_ROOT/../.xcode.env.local\"\nfi\n\nexport RCT_METRO_PORT=\"${RCT_METRO_PORT:=8081}\"\necho \"export RCT_METRO_PORT=${RCT_METRO_PORT}\" > `$NODE_BINARY --print \"require('path').dirname(require.resolve('react-native/package.json')) + '/scripts/.packager.env'\"`\nif [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n if nc -w 5 -z localhost ${RCT_METRO_PORT} ; then\n if ! curl -s \"http://localhost:${RCT_METRO_PORT}/status\" | grep -q \"packager-status:running\" ; then\n echo \"Port ${RCT_METRO_PORT} already in use, packager is either not running or not running correctly\"\n exit 2\n fi\n else\n open `$NODE_BINARY --print \"require('path').dirname(require.resolve('expo/package.json')) + '/scripts/launchPackager.command'\"` || echo \"Can't start packager automatically\"\n fi\nfi\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ diff --git a/package-lock.json b/package-lock.json index de63f5c91158..c87140ea5085 100644 --- a/package-lock.json +++ b/package-lock.json @@ -183,10 +183,10 @@ "@react-native/babel-preset": "0.81.4", "@react-native/metro-config": "0.81.4", "@react-navigation/devtools": "^6.0.10", - "@rock-js/platform-android": "0.11.5", - "@rock-js/platform-ios": "0.11.5", - "@rock-js/plugin-metro": "0.11.5", - "@rock-js/provider-github": "0.11.5", + "@rock-js/platform-android": "0.11.7", + "@rock-js/platform-ios": "0.11.7", + "@rock-js/plugin-metro": "0.11.7", + "@rock-js/provider-github": "0.11.7", "@storybook/addon-a11y": "^8.6.9", "@storybook/addon-essentials": "^8.6.9", "@storybook/addon-webpack5-compiler-babel": "^3.0.5", @@ -278,7 +278,7 @@ "react-refresh": "^0.14.2", "react-test-renderer": "19.1.0", "reassure": "^1.0.0-rc.4", - "rock": "0.11.5", + "rock": "0.11.7", "semver": "7.5.2", "setimmediate": "^1.0.5", "shellcheck": "^1.1.0", @@ -11175,40 +11175,28 @@ } }, "node_modules/@rock-js/config": { - "version": "0.11.6", - "resolved": "https://registry.npmjs.org/@rock-js/config/-/config-0.11.6.tgz", - "integrity": "sha512-0oWrrlw36avPcd4XdmeR2tfhEt8aJqhBZT+afrsGxzKUYUYUj0Uh/OcGyP0YtqZe6bf70P0Ey95sZHlz6SCcsA==", + "version": "0.11.7", + "resolved": "https://registry.npmjs.org/@rock-js/config/-/config-0.11.7.tgz", + "integrity": "sha512-7ZKlSfkv4SdUq++nhK9uCvUtApt5fLEJmcF7cry6l8yMyk9EA22l6r+HuSrb99wHCdqbcCueFbuyNOMBNHsxsQ==", "dev": true, "license": "MIT", "dependencies": { "@babel/code-frame": "^7.26.2", - "@rock-js/provider-github": "^0.11.6", - "@rock-js/tools": "^0.11.6", + "@rock-js/provider-github": "^0.11.7", + "@rock-js/tools": "^0.11.7", "joi": "^17.13.3", "tslib": "^2.3.0" } }, - "node_modules/@rock-js/config/node_modules/@rock-js/provider-github": { - "version": "0.11.6", - "resolved": "https://registry.npmjs.org/@rock-js/provider-github/-/provider-github-0.11.6.tgz", - "integrity": "sha512-EtwHh83XketOVnoOX4CeeRfHLzgmhhfvlslXedYlK6AgtMotPe7XQ1btFV/x473tY8eC/pBHofuc5oCOXKWlJg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@rock-js/tools": "^0.11.6", - "ts-regex-builder": "^1.8.2", - "tslib": "^2.3.0" - } - }, "node_modules/@rock-js/platform-android": { - "version": "0.11.5", - "resolved": "https://registry.npmjs.org/@rock-js/platform-android/-/platform-android-0.11.5.tgz", - "integrity": "sha512-iY7ssjRg26mkeuWSwJ4RhuzKcd8VaIEmmiFaOr7k0lY8msetu6nczyUo7v1H36W5mBAYt3JMSmojsix6C8y9xA==", + "version": "0.11.7", + "resolved": "https://registry.npmjs.org/@rock-js/platform-android/-/platform-android-0.11.7.tgz", + "integrity": "sha512-w8bKfxteQAWwExUHv52qfDe4eiuR1IHOmkD9BDCcWofI3zQWo3fqG9ZteavdOyUKLSy6JU6w38puemd0xF+VXQ==", "dev": true, "license": "MIT", "dependencies": { "@react-native-community/cli-config-android": "^20.0.0", - "@rock-js/tools": "^0.11.5", + "@rock-js/tools": "^0.11.7", "adm-zip": "^0.5.16", "tslib": "^2.3.0" } @@ -11322,15 +11310,15 @@ } }, "node_modules/@rock-js/platform-apple-helpers": { - "version": "0.11.6", - "resolved": "https://registry.npmjs.org/@rock-js/platform-apple-helpers/-/platform-apple-helpers-0.11.6.tgz", - "integrity": "sha512-labmm6uPdp3BjGEtilcrCEwne6tsXAsCTDdj4IlPaqszuEkuwxmKwMyMffFt4qETL8RQDZky6rhx57TBpz8aOg==", + "version": "0.11.7", + "resolved": "https://registry.npmjs.org/@rock-js/platform-apple-helpers/-/platform-apple-helpers-0.11.7.tgz", + "integrity": "sha512-ohEZh6C11QP9E/C6lepLxB7V9sOZ5oe9j/pxS/EkiT4oRmNV0WUYUysMM3sqtb0g4ulqLIe+aGNygLzH+p2oRg==", "dev": true, "license": "MIT", "dependencies": { "@react-native-community/cli-config": "^20.0.0", "@react-native-community/cli-config-apple": "^20.0.0", - "@rock-js/tools": "^0.11.6", + "@rock-js/tools": "^0.11.7", "adm-zip": "^0.5.16", "fast-xml-parser": "^4.5.0", "tslib": "^2.3.0" @@ -11507,16 +11495,16 @@ } }, "node_modules/@rock-js/platform-ios": { - "version": "0.11.5", - "resolved": "https://registry.npmjs.org/@rock-js/platform-ios/-/platform-ios-0.11.5.tgz", - "integrity": "sha512-W3JvNEpa/RsOBVBjakihKxWS3ySathmdkQROaj/MZBhfAKupdxCguWzpZW/tvKGXYtfQSMcWFLzwFLj08VkNgQ==", + "version": "0.11.7", + "resolved": "https://registry.npmjs.org/@rock-js/platform-ios/-/platform-ios-0.11.7.tgz", + "integrity": "sha512-nhp0k0n2AEvPKilpJI6pOW7e1oTVuvZ9hk24OyR75ncDR2DOMvWSIxDqaA7JBv2e6DbDtQX3zP9Cvum8UQkP9Q==", "dev": true, "license": "MIT", "dependencies": { "@react-native-community/cli-config-apple": "^20.0.0", "@react-native-community/cli-types": "^20.0.0", - "@rock-js/platform-apple-helpers": "^0.11.5", - "@rock-js/tools": "^0.11.5", + "@rock-js/platform-apple-helpers": "^0.11.7", + "@rock-js/tools": "^0.11.7", "tslib": "^2.3.0" } }, @@ -11639,14 +11627,14 @@ } }, "node_modules/@rock-js/plugin-metro": { - "version": "0.11.5", - "resolved": "https://registry.npmjs.org/@rock-js/plugin-metro/-/plugin-metro-0.11.5.tgz", - "integrity": "sha512-xuwfuFZ/2hd7fEk73/MBjUaPGGZcqZKZ6HPEq8n+5q0a7hzNquPZCJhxTA5IMWCWOj4nnCBWVtreeE7eIsJsNQ==", + "version": "0.11.7", + "resolved": "https://registry.npmjs.org/@rock-js/plugin-metro/-/plugin-metro-0.11.7.tgz", + "integrity": "sha512-akoqsNq0krkRw33guVbR1YFqpa1ORO0nCkuVHxUZpKG2I3GYzX09DkWcB/o/w3BxhlHpJI+KoTotHvBuAzFu1A==", "dev": true, "license": "MIT", "dependencies": { "@react-native-community/cli-server-api": "^20.0.0", - "@rock-js/tools": "^0.11.5", + "@rock-js/tools": "^0.11.7", "metro": "^0.83.1", "metro-config": "^0.83.1", "metro-core": "^0.83.1", @@ -12190,21 +12178,21 @@ } }, "node_modules/@rock-js/provider-github": { - "version": "0.11.5", - "resolved": "https://registry.npmjs.org/@rock-js/provider-github/-/provider-github-0.11.5.tgz", - "integrity": "sha512-xXcLJ3GI0eDY2GL3p8Ejzr7myXunV1W+bveCnDBKzggs4n/975nGFxxVqojdc00R9h6kKCCwMHXUiKapcXzLIQ==", + "version": "0.11.7", + "resolved": "https://registry.npmjs.org/@rock-js/provider-github/-/provider-github-0.11.7.tgz", + "integrity": "sha512-uX+5/rnERz7APRV7Y6dZvtCxsmU9jzHsf+AXtF9Zf5X3WwFI87keXfON0fJIC8MdIzToYNb5mah4+MPLxNVe9A==", "dev": true, "license": "MIT", "dependencies": { - "@rock-js/tools": "^0.11.5", + "@rock-js/tools": "^0.11.7", "ts-regex-builder": "^1.8.2", "tslib": "^2.3.0" } }, "node_modules/@rock-js/tools": { - "version": "0.11.6", - "resolved": "https://registry.npmjs.org/@rock-js/tools/-/tools-0.11.6.tgz", - "integrity": "sha512-UfjUennTNsMlVeJQd6kLx4gYq9NFnNQl0ai2V0Cws/QNX1Zeq1ubgVNdfV9dkVB87Jlji6awJxOIRQAYlgkROQ==", + "version": "0.11.7", + "resolved": "https://registry.npmjs.org/@rock-js/tools/-/tools-0.11.7.tgz", + "integrity": "sha512-YZ/Yq+gV01YUxBXYK12LHwRBc+8Kqk3nowrINXMOcOYUJVSPXj6X2izTXhqJgqOet516uMbqCHZaImWAmtPjlg==", "dev": true, "license": "MIT", "dependencies": { @@ -24133,9 +24121,9 @@ } }, "node_modules/fs-fingerprint/node_modules/p-limit": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-7.1.1.tgz", - "integrity": "sha512-i8PyM2JnsNChVSYWLr2BAjNoLi0BAYC+wecOnZnVV+YSNJkzP7cWmvI34dk0WArWfH9KwBHNoZI3P3MppImlIA==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-7.2.0.tgz", + "integrity": "sha512-ATHLtwoTNDloHRFFxFJdHnG6n2WUeFjaR8XQMFdKIv0xkXjrER8/iG9iu265jOM95zXHAfv9oTkqhrfbIzosrQ==", "dev": true, "license": "MIT", "dependencies": { @@ -34454,15 +34442,15 @@ "license": "BSD-3-Clause" }, "node_modules/rock": { - "version": "0.11.5", - "resolved": "https://registry.npmjs.org/rock/-/rock-0.11.5.tgz", - "integrity": "sha512-VXNPnEOQam1K2zVoKyL0vpPXFIU1jCi7vWVRDHz6DjV9g8/5dlJoWX5/lyOI5r5295Z1R86tZTu7104huIFClw==", + "version": "0.11.7", + "resolved": "https://registry.npmjs.org/rock/-/rock-0.11.7.tgz", + "integrity": "sha512-1U1NT/qzAfV06OlkTf1ftSqCb/FLKPMC2sQTfQtYfdGzaRJYNsIXSz1KPqh6a2ph4/fELmwdmhfOLBX5LCCoqQ==", "dev": true, "license": "MIT", "dependencies": { "@react-native-community/cli-config": "^20.0.0", - "@rock-js/config": "^0.11.5", - "@rock-js/tools": "^0.11.5", + "@rock-js/config": "^0.11.7", + "@rock-js/tools": "^0.11.7", "adm-zip": "^0.5.16", "commander": "^12.1.0", "tar": "^7.5.1", diff --git a/package.json b/package.json index 21809841be7a..a8bbc377da97 100644 --- a/package.json +++ b/package.json @@ -253,10 +253,10 @@ "@react-native/babel-preset": "0.81.4", "@react-native/metro-config": "0.81.4", "@react-navigation/devtools": "^6.0.10", - "@rock-js/platform-android": "0.11.5", - "@rock-js/platform-ios": "0.11.5", - "@rock-js/plugin-metro": "0.11.5", - "@rock-js/provider-github": "0.11.5", + "@rock-js/platform-android": "0.11.7", + "@rock-js/platform-ios": "0.11.7", + "@rock-js/plugin-metro": "0.11.7", + "@rock-js/provider-github": "0.11.7", "@storybook/addon-a11y": "^8.6.9", "@storybook/addon-essentials": "^8.6.9", "@storybook/addon-webpack5-compiler-babel": "^3.0.5", @@ -348,7 +348,7 @@ "react-refresh": "^0.14.2", "react-test-renderer": "19.1.0", "reassure": "^1.0.0-rc.4", - "rock": "0.11.5", + "rock": "0.11.7", "semver": "7.5.2", "setimmediate": "^1.0.5", "shellcheck": "^1.1.0", diff --git a/patches/@rock-js/platform-apple-helpers/@rock-js+platform-apple-helpers+0.11.6+001+fix-ios-remote-builds.patch b/patches/@rock-js/platform-apple-helpers/@rock-js+platform-apple-helpers+0.11.7+001+fix-ios-remote-builds.patch similarity index 100% rename from patches/@rock-js/platform-apple-helpers/@rock-js+platform-apple-helpers+0.11.6+001+fix-ios-remote-builds.patch rename to patches/@rock-js/platform-apple-helpers/@rock-js+platform-apple-helpers+0.11.7+001+fix-ios-remote-builds.patch diff --git a/patches/@rock-js/platform-apple-helpers/details.md b/patches/@rock-js/platform-apple-helpers/details.md index 041422feece8..71fea90e1f94 100644 --- a/patches/@rock-js/platform-apple-helpers/details.md +++ b/patches/@rock-js/platform-apple-helpers/details.md @@ -1,6 +1,6 @@ # `@rock-js/platform-apple-helpers` patches -### [@rock-js+platform-apple-helpers+0.11.6+001+fix-ios-remote-builds.patch](@rock-js+platform-apple-helpers+0.11.6+001+fix-ios-remote-builds.patch) +### [@rock-js+platform-apple-helpers+0.11.7+001+fix-ios-remote-builds.patch](@rock-js+platform-apple-helpers+0.11.7+001+fix-ios-remote-builds.patch) - Reason: diff --git a/scripts/run-build.sh b/scripts/run-build.sh index 18e92e089563..da127cf5ffd3 100755 --- a/scripts/run-build.sh +++ b/scripts/run-build.sh @@ -35,7 +35,7 @@ IS_HYBRID_APP_REPO=$(scripts/is-hybrid-app.sh) # See if we should force standalone NewDot build NEW_DOT_FLAG="${STANDALONE_NEW_DOT:-false}" - if [[ "$IS_HYBRID_APP_REPO" == "true" && "$NEW_DOT_FLAG" == "false" ]]; then +if [[ "$IS_HYBRID_APP_REPO" == "true" && "$NEW_DOT_FLAG" == "false" ]]; then # Set HybridApp-specific arguments IOS_MODE="Debug" ANDROID_MODE="Debug" @@ -57,16 +57,16 @@ fi # Check if the argument is one of the desired values case "$BUILD" in --ios) - npx rock run:ios --configuration $IOS_MODE --scheme "$SCHEME" + npx rock run:ios --configuration $IOS_MODE --scheme "$SCHEME" --dev-server ;; --ipad) - npx rock run:ios --simulator "iPad Pro (12.9-inch) (6th generation)" --configuration $IOS_MODE --scheme "$SCHEME" + npx rock run:ios --simulator "iPad Pro (12.9-inch) (6th generation)" --configuration $IOS_MODE --scheme "$SCHEME" --dev-server ;; --ipad-sm) - npx rock run:ios --simulator "iPad Pro (11-inch) (4th generation)" --configuration $IOS_MODE --scheme "$SCHEME" + npx rock run:ios --simulator "iPad Pro (11-inch) (4th generation)" --configuration $IOS_MODE --scheme "$SCHEME" --dev-server ;; --android) - npx rock run:android --variant $ANDROID_MODE --app-id $APP_ID --active-arch-only --verbose + npx rock run:android --variant $ANDROID_MODE --app-id $APP_ID --active-arch-only --verbose --dev-server ;; *) print_error_and_exit