[Wallet] Upgrade app version to v1.5.1

packages/mobile/README.md

@@ -160,6 +160,11 @@ export CELO_RELEASE_KEY_PASSWORD=celoFakeReleaseKeyPass
 ### Building an APK or Bundle
 
 ```sh
+# With fastlane:
+bundle install
+bundle exec fastlane android build_apk env:YOUR_BUILDING_VARIANT sdkEnv:YOUR_SDK_ENV
+
+# Or, manually
 cd android/
 ./gradlew clean
 ./gradlew bundle{YOUR_BUILDING_VARIANT}JsAndAssets

packages/mobile/android/app/build.gradle

@@ -125,7 +125,7 @@ android {
         minSdkVersion isDetoxTestBuild ? rootProject.ext.minSdkVersion : 18
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode appVersionCode
-        versionName "1.5.0"
+        versionName "1.5.1"
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         resValue "string", "build_config_package", "org.celo.mobile"

packages/mobile/android/gradle.properties

@@ -20,4 +20,5 @@
 CELO_RELEASE_STORE_FILE=celo-release-key.keystore
 CELO_RELEASE_KEY_ALIAS=celo-key-alias
 # Setting this manually based on version number until we have this deploying via Cloud Build
-VERSION_CODE=100500001
+# Example: v1.5.1 deployment number 1 = 100500101
+VERSION_CODE=100500101

packages/mobile/fastlane/Fastfile

@@ -14,7 +14,7 @@ def get_bundle(env)
   return $bundle_name + env
 end
 
-def fastlane_supply(env, track, bundle_suffix)
+def fastlane_supply(env, track, bundle_suffix, skip_deploy)
   return supply(
     json_key: 'fastlane/google-play-service-account.json',
     track: track,
@@ -36,19 +36,23 @@ platform :android do
 
   desc 'Build the Android application - requires environment param'
   lane :build do |options|
+    clean
     sh('yarn', 'run', 'build:sdk', options[:sdkEnv])
     environment = options[:environment].capitalize
     ENV["GRADLE_OPTS"] = '-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-Xmx256m -XX:+HeapDumpOnOutOfMemoryError"'
     gradle(task: 'bundle' + environment + 'JsAndAssets', project_dir: 'android/')
     ENV["GRADLE_OPTS"] = '-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-Xmx3500m -XX:+HeapDumpOnOutOfMemoryError"'
-    gradle(task: 'bundle', build_type: environment, project_dir: 'android/', flags: '-x bundle' + environment + 'JsAndAssets')
+    if options[:buildApk]
+      gradle(task: 'assemble', build_type: environment, project_dir: 'android/', flags: '-x bundle' + environment + 'JsAndAssets')
+    else
+      gradle(task: 'bundle', build_type: environment, project_dir: 'android/', flags: '-x bundle' + environment + 'JsAndAssets')
+    end
   end
 
   desc 'Ship Integration to Playstore Internal'
   lane :integration do
     env = 'integration'
     sdkEnv = 'integration'
-    clean
     build(environment: env, sdkEnv: sdkEnv)
     fastlane_supply(env, 'internal', env)
   end
@@ -57,7 +61,6 @@ platform :android do
   lane :staging do
     env = 'staging'
     sdkEnv = 'alfajoresstaging'
-    clean
     build(environment: env, sdkEnv: sdkEnv)
     fastlane_supply(env, 'internal', env)
   end
@@ -66,7 +69,6 @@ platform :android do
   lane :production do
     env = 'release'
     sdkEnv = 'argentinaproduction'
-    clean
     build(environment: env, sdkEnv: sdkEnv)
     fastlane_supply(env, 'alpha', 'production')
   end
@@ -75,7 +77,6 @@ platform :android do
   lane :alfajores do
     env = 'alfajores'
     sdkEnv = 'alfajores'
-    clean
     build(environment: env, sdkEnv: sdkEnv)
     fastlane_supply(env, 'internal', env)
   end
@@ -84,10 +85,23 @@ platform :android do
   lane :pilotapp do
     env = 'pilot'
     sdkEnv = 'pilot'
-    clean
     build(environment: env, sdkEnv: sdkEnv)
     fastlane_supply(env, 'internal', env)
   end
+
+  desc 'Build an Android apk'
+  lane :build_apk do |options|
+    env = options[:env]
+    sdkEnv = options[:sdkEnv]
+    build(environment: env, sdkEnv: sdkEnv, buildApk: true)
+  end
+
+  desc 'Build an Android bundle'
+  lane :build_bundle do |options|
+    env = options[:env]
+    sdkEnv = options[:sdkEnv]
+    build(environment: env, sdkEnv: sdkEnv)
+  end
 end
 
 

packages/mobile/fastlane/README.md

@@ -76,6 +76,22 @@ fastlane android pilotapp
 
 Ship Pilot to Playstore Internal
 
+### android build_apk
+
+```
+fastlane android build_apk
+```
+
+Build an Android apk
+
+### android build_bundle
+
+```
+fastlane android build_bundle
+```
+
+Build an Android bundle
+
 ---
 
 This README.md is auto-generated and will be re-generated every time [fastlane](https://fastlane.tools) is run.

packages/mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@celo/mobile",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "author": "Celo",
   "license": "Apache-2.0",
   "private": true,