Merge pull request #9337 from Expensify/OSBotify-cherry-pick-staging-…

…9120 🍒 Cherry pick PR #9120 to staging 🍒
Expensify · Jun 7, 2022 · 7802867 · 7802867
2 parents 967c96a + eae791f
commit 7802867
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
@@ -82,6 +82,10 @@ jobs:
       - name: Run Fastlane beta
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         run: bundle exec fastlane android beta
+        env:
+          MYAPP_UPLOAD_STORE_PASSWORD: ${{ secrets.MYAPP_UPLOAD_STORE_PASSWORD }}
+          MYAPP_UPLOAD_KEY_PASSWORD: ${{ secrets.MYAPP_UPLOAD_KEY_PASSWORD }}
+
 
       - name: Run Fastlane production
         if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001017300
-        versionName "1.1.73-0"
+        versionCode 1001017301
+        versionName "1.1.73-1"
     }
     splits {
         abi {
@@ -167,9 +167,9 @@ android {
         release {
             if (project.hasProperty('MYAPP_UPLOAD_STORE_FILE')) {
                 storeFile file(MYAPP_UPLOAD_STORE_FILE)
-                storePassword MYAPP_UPLOAD_STORE_PASSWORD
+                storePassword System.getenv('MYAPP_UPLOAD_STORE_PASSWORD')
                 keyAlias MYAPP_UPLOAD_KEY_ALIAS
-                keyPassword MYAPP_UPLOAD_KEY_PASSWORD
+                keyPassword System.getenv('MYAPP_UPLOAD_KEY_PASSWORD')
             }
         }
         debug {

diff --git a/android/app/my-upload-key.keystore.gpg b/android/app/my-upload-key.keystore.gpg
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -33,8 +33,6 @@ FLIPPER_VERSION=0.100.0
 
 # Key Store Information
 MYAPP_UPLOAD_STORE_FILE=my-upload-key.keystore
-MYAPP_UPLOAD_STORE_PASSWORD=jab-devalue-medley-quartet-ambition-demigod-shinbone-luster-inject-while
 
 # Key Information
 MYAPP_UPLOAD_KEY_ALIAS=ReactNativeChat-Key-Alias
-MYAPP_UPLOAD_KEY_PASSWORD=pry-eave-cervix-deltoid-plaudit-bunting-larynges-octagon-jetliner-possum
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.73.0</string>
+	<string>1.1.73.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.73.0</string>
+	<string>1.1.73.1</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.73-0",
+  "version": "1.1.73-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.",