From 1e11d06ab3f1baa9698f5271dcc9a755d0699114 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Mon, 15 Jul 2024 12:10:12 +0000 Subject: [PATCH 1/3] Update version to 9.0.6-5 (cherry picked from commit d301d4532b9327c1d07b7026bb0f2f51432fd861) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- ios/NotificationServiceExtension/Info.plist | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index e073ee539c3a..fe6ab9ec711e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -107,8 +107,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1009000604 - versionName "9.0.6-4" + versionCode 1009000605 + versionName "9.0.6-5" // Supported language variants must be declared here to avoid from being removed during the compilation. // This also helps us to not include unnecessary language variants in the APK. resConfigs "en", "es" diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 7aed56b89e2f..636e421ce561 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -40,7 +40,7 @@ CFBundleVersion - 9.0.6.4 + 9.0.6.5 FullStory OrgId diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index d96aa68a6cfc..3f7715cc4704 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 9.0.6.4 + 9.0.6.5 diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index a8f186e22101..5d021584c80c 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 9.0.6 CFBundleVersion - 9.0.6.4 + 9.0.6.5 NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index 9eead5713abd..73e47aaed6e6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "9.0.6-4", + "version": "9.0.6-5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "9.0.6-4", + "version": "9.0.6-5", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 4563b1ceb228..f8720a101476 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "9.0.6-4", + "version": "9.0.6-5", "author": "Expensify, Inc.", "homepage": "https://new.expensify.com", "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.", From 7a70607ceb657b372e2cd65e47c612a1ebd73f24 Mon Sep 17 00:00:00 2001 From: Jules Date: Mon, 15 Jul 2024 12:59:52 +0100 Subject: [PATCH 2/3] Merge pull request #45332 from Expensify/jules-androidBuildFailure [NO QA] Attempt to fix Android builds with ruby workaround (cherry picked from commit 20eb52e6b8c29dceb6851e597539d2b8fd2b3a6f) --- .github/workflows/platformDeploy.yml | 2 ++ .github/workflows/testBuild.yml | 1 + ...eact-native-community+netinfo+11.2.1+002+turbomodule.patch | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml index 640d1eaa1172..2b2667d587e8 100644 --- a/.github/workflows/platformDeploy.yml +++ b/.github/workflows/platformDeploy.yml @@ -84,6 +84,7 @@ jobs: if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }} run: bundle exec fastlane android beta env: + RUBYOPT: '-rostruct' # TODO: Temporary fix until https://github.com/fastlane/fastlane/pull/21950 gets released MYAPP_UPLOAD_STORE_PASSWORD: ${{ secrets.MYAPP_UPLOAD_STORE_PASSWORD }} MYAPP_UPLOAD_KEY_PASSWORD: ${{ secrets.MYAPP_UPLOAD_KEY_PASSWORD }} @@ -91,6 +92,7 @@ jobs: if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }} run: bundle exec fastlane android production env: + RUBYOPT: '-rostruct' # TODO: Temporary fix until https://github.com/fastlane/fastlane/pull/21950 gets released VERSION: ${{ env.VERSION_CODE }} - name: Archive Android sourcemaps diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml index 10912aaeb436..9f6d20de4369 100644 --- a/.github/workflows/testBuild.yml +++ b/.github/workflows/testBuild.yml @@ -1,3 +1,4 @@ + name: Build and deploy apps for testing on: diff --git a/patches/@react-native-community+netinfo+11.2.1+002+turbomodule.patch b/patches/@react-native-community+netinfo+11.2.1+002+turbomodule.patch index f8e171008e14..3b164672efb9 100644 --- a/patches/@react-native-community+netinfo+11.2.1+002+turbomodule.patch +++ b/patches/@react-native-community+netinfo+11.2.1+002+turbomodule.patch @@ -3062,4 +3062,8 @@ index 878f7ba..0000000 - -#Files generated by the VS build -**/Generated Files/** +<<<<<<< HEAD - +======= +- +>>>>>>> 20eb52e6 (Merge pull request #45332 from Expensify/jules-androidBuildFailure) From 049681722db6c989979fef6e6151c24d5703f7ed Mon Sep 17 00:00:00 2001 From: Jules Rosser Date: Mon, 15 Jul 2024 13:14:55 +0100 Subject: [PATCH 3/3] resolve conflict with patch that fixes builds --- ...eact-native-community+netinfo+11.2.1+002+turbomodule.patch | 4 ---- 1 file changed, 4 deletions(-) diff --git a/patches/@react-native-community+netinfo+11.2.1+002+turbomodule.patch b/patches/@react-native-community+netinfo+11.2.1+002+turbomodule.patch index 3b164672efb9..f8e171008e14 100644 --- a/patches/@react-native-community+netinfo+11.2.1+002+turbomodule.patch +++ b/patches/@react-native-community+netinfo+11.2.1+002+turbomodule.patch @@ -3062,8 +3062,4 @@ index 878f7ba..0000000 - -#Files generated by the VS build -**/Generated Files/** -<<<<<<< HEAD - -======= -- ->>>>>>> 20eb52e6 (Merge pull request #45332 from Expensify/jules-androidBuildFailure)