From 636ccd6713e83519378113b738018d25dee82b21 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Thu, 20 Jun 2024 20:16:05 +0000 Subject: [PATCH 1/3] Update version to 9.0.0-1 (cherry picked from commit 0201d6c83b9db31bb9a086293ea714318627eb5c) --- 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 d7d06b46ccbd..1cbae00d2b4e 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 1001048600 - versionName "1.4.86-0" + versionCode 1009000001 + versionName "9.0.0-1" // 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 532fce46ad8e..6c4a0a664d7b 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -40,7 +40,7 @@ CFBundleVersion - 1.4.86.0 + 9.0.0.1 FullStory OrgId diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 3027cc7d2aac..da4424555c5d 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.4.86.0 + 9.0.0.1 diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index d8d8da1d8401..c4daea4ac7ca 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,7 +13,7 @@ CFBundleShortVersionString 1.4.86 CFBundleVersion - 1.4.86.0 + 9.0.0.1 NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index 6c73746a327a..f556cb3c8856 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.4.86-0", + "version": "9.0.0-1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.4.86-0", + "version": "9.0.0-1", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index b407164e5fa7..8eed13ed268c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.4.86-0", + "version": "9.0.0-1", "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 dc203be129e25fbe7e0ca5093d5e93ec5655582d Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Wed, 19 Jun 2024 16:23:39 -0600 Subject: [PATCH 2/3] Merge pull request #44045 from Expensify/andrew-hybrid-verison-9 Update to version 9.0.0.0 in preparation for HybridApp (cherry picked from commit 5b0d3e8f1cb35b77c5ca0fd457b06d0e74e44190) --- .github/workflows/platformDeploy.yml | 5 ++++- android/app/build.gradle | 5 +++++ ios/NewExpensify/Info.plist | 6 +++++- ios/NewExpensifyTests/Info.plist | 6 +++++- ios/NotificationServiceExtension/Info.plist | 6 +++++- package-lock.json | 8 ++++++++ package.json | 4 ++++ 7 files changed, 36 insertions(+), 4 deletions(-) diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml index 91203a65b5ce..dd169a25c63d 100644 --- a/.github/workflows/platformDeploy.yml +++ b/.github/workflows/platformDeploy.yml @@ -372,8 +372,11 @@ jobs: needs: validateActor if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) && github.event_name == 'push' }} steps: + - name: Get version + run: echo "VERSION=$(npm run print-version --silent)" >> "$GITHUB_ENV" + - name: 'Deploy HybridApp' - run: gh workflow run --repo Expensify/Mobile-Deploy deploy.yml -f force_build=true + run: gh workflow run --repo Expensify/Mobile-Deploy deploy.yml -f force_build=true -f build_version=${{ env.VERSION }} env: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} diff --git a/android/app/build.gradle b/android/app/build.gradle index 1cbae00d2b4e..524a1eb14bf6 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -107,8 +107,13 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled +<<<<<<< HEAD versionCode 1009000001 versionName "9.0.0-1" +======= + versionCode 1009000000 + versionName "9.0.0-0" +>>>>>>> 5b0d3e8 (Merge pull request #44045 from Expensify/andrew-hybrid-verison-9) // 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 6c4a0a664d7b..7f3b72757fcb 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.4.86 + 9.0.0 CFBundleSignature ???? CFBundleURLTypes @@ -40,7 +40,11 @@ CFBundleVersion +<<<<<<< HEAD 9.0.0.1 +======= + 9.0.0.0 +>>>>>>> 5b0d3e8 (Merge pull request #44045 from Expensify/andrew-hybrid-verison-9) FullStory OrgId diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index da4424555c5d..1de879fcf4f7 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -15,10 +15,14 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.4.86 + 9.0.0 CFBundleSignature ???? CFBundleVersion +<<<<<<< HEAD 9.0.0.1 +======= + 9.0.0.0 +>>>>>>> 5b0d3e8 (Merge pull request #44045 from Expensify/andrew-hybrid-verison-9) diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index c4daea4ac7ca..f11ce3cc47ea 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -11,9 +11,13 @@ CFBundleName $(PRODUCT_NAME) CFBundleShortVersionString - 1.4.86 + 9.0.0 CFBundleVersion +<<<<<<< HEAD 9.0.0.1 +======= + 9.0.0.0 +>>>>>>> 5b0d3e8 (Merge pull request #44045 from Expensify/andrew-hybrid-verison-9) NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index f556cb3c8856..75e0ce05d492 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,20 @@ { "name": "new.expensify", +<<<<<<< HEAD "version": "9.0.0-1", +======= + "version": "9.0.0-0", +>>>>>>> 5b0d3e8 (Merge pull request #44045 from Expensify/andrew-hybrid-verison-9) "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", +<<<<<<< HEAD "version": "9.0.0-1", +======= + "version": "9.0.0-0", +>>>>>>> 5b0d3e8 (Merge pull request #44045 from Expensify/andrew-hybrid-verison-9) "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 8eed13ed268c..afe673aad3f1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,10 @@ { "name": "new.expensify", +<<<<<<< HEAD "version": "9.0.0-1", +======= + "version": "9.0.0-0", +>>>>>>> 5b0d3e8 (Merge pull request #44045 from Expensify/andrew-hybrid-verison-9) "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 5b47e79ca42e4e6a7c5d9c9974eed4aea125fd6d Mon Sep 17 00:00:00 2001 From: rory Date: Thu, 20 Jun 2024 13:20:11 -0700 Subject: [PATCH 3/3] Resolve conflicts - use 9.0.0-0 --- android/app/build.gradle | 5 ----- ios/NewExpensify/Info.plist | 4 ---- ios/NewExpensifyTests/Info.plist | 4 ---- ios/NotificationServiceExtension/Info.plist | 4 ---- package-lock.json | 8 -------- package.json | 4 ---- 6 files changed, 29 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 524a1eb14bf6..18e95556867c 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -107,13 +107,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled -<<<<<<< HEAD - versionCode 1009000001 - versionName "9.0.0-1" -======= versionCode 1009000000 versionName "9.0.0-0" ->>>>>>> 5b0d3e8 (Merge pull request #44045 from Expensify/andrew-hybrid-verison-9) // 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 7f3b72757fcb..23384a1402e5 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -40,11 +40,7 @@ CFBundleVersion -<<<<<<< HEAD - 9.0.0.1 -======= 9.0.0.0 ->>>>>>> 5b0d3e8 (Merge pull request #44045 from Expensify/andrew-hybrid-verison-9) FullStory OrgId diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 1de879fcf4f7..2c4191ab0703 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,10 +19,6 @@ CFBundleSignature ???? CFBundleVersion -<<<<<<< HEAD - 9.0.0.1 -======= 9.0.0.0 ->>>>>>> 5b0d3e8 (Merge pull request #44045 from Expensify/andrew-hybrid-verison-9) diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist index f11ce3cc47ea..11eebb990594 100644 --- a/ios/NotificationServiceExtension/Info.plist +++ b/ios/NotificationServiceExtension/Info.plist @@ -13,11 +13,7 @@ CFBundleShortVersionString 9.0.0 CFBundleVersion -<<<<<<< HEAD - 9.0.0.1 -======= 9.0.0.0 ->>>>>>> 5b0d3e8 (Merge pull request #44045 from Expensify/andrew-hybrid-verison-9) NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index 75e0ce05d492..4db3048e6ab4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,20 +1,12 @@ { "name": "new.expensify", -<<<<<<< HEAD - "version": "9.0.0-1", -======= "version": "9.0.0-0", ->>>>>>> 5b0d3e8 (Merge pull request #44045 from Expensify/andrew-hybrid-verison-9) "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "new.expensify", -<<<<<<< HEAD - "version": "9.0.0-1", -======= "version": "9.0.0-0", ->>>>>>> 5b0d3e8 (Merge pull request #44045 from Expensify/andrew-hybrid-verison-9) "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index afe673aad3f1..49c8dc84a15d 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,6 @@ { "name": "new.expensify", -<<<<<<< HEAD - "version": "9.0.0-1", -======= "version": "9.0.0-0", ->>>>>>> 5b0d3e8 (Merge pull request #44045 from Expensify/andrew-hybrid-verison-9) "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.",