From a6332a0c02e3924ca68dca957ecc153a554c3deb Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 7 Sep 2020 16:57:42 -0300
Subject: [wallet] prepare play store upload

---
 wallet/.gitignore        |  1 +
 wallet/build.gradle      |  2 +-
 wallet/fastlane/Fastfile | 21 +++++++++++++++++++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/wallet/.gitignore b/wallet/.gitignore
index 094515c..fa4dd35 100644
--- a/wallet/.gitignore
+++ b/wallet/.gitignore
@@ -1,2 +1,3 @@
 /build
+/.bundle
 /src/main/assets/taler-wallet-android-*.js
diff --git a/wallet/build.gradle b/wallet/build.gradle
index 0e04d17..0ca1636 100644
--- a/wallet/build.gradle
+++ b/wallet/build.gradle
@@ -46,7 +46,7 @@ android {
         applicationId "net.taler.wallet"
         minSdkVersion 24
         targetSdkVersion 29
-        versionCode 6
+        versionCode 8
         versionName "0.7.1.dev.28"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField "String", "WALLET_CORE_VERSION", "\"$walletCoreVersion\""
diff --git a/wallet/fastlane/Fastfile b/wallet/fastlane/Fastfile
index 559acac..3c2f8cd 100644
--- a/wallet/fastlane/Fastfile
+++ b/wallet/fastlane/Fastfile
@@ -25,8 +25,25 @@ platform :android do
 
   desc "Deploy a new version to the Google Play beta track"
   lane :deploy do
-    gradle(task: "clean assembleRelease", gradle_path: '../gradlew')
-    upload_to_play_store(track: 'beta', skip_upload_images: 'true', skip_upload_screenshots: 'true', validate_only: 'true')
+    gradle(
+        task: "bundle",
+        build_type: "Release",
+        flavor: "google",
+        gradle_path: '../gradlew',
+        properties: {
+            "android.injected.signing.store.file" => ENV["TALER_KEYSTORE_PATH"],
+            "android.injected.signing.store.password" => ENV["TALER_KEYSTORE_PASS"],
+            "android.injected.signing.key.alias" => ENV["TALER_KEYSTORE_WALLET_ALIAS"],
+            "android.injected.signing.key.password" => ENV["TALER_KEYSTORE_WALLET_PASS"],
+        }
+    )
+    upload_to_play_store(
+        track: 'beta',
+        skip_upload_images: 'true',
+        skip_upload_screenshots: 'true',
+        skip_upload_apk: 'true', # This is an app bundle, so APK is not possible
+        validate_only: 'true'
+    )
   end
 end
 
-- 
cgit v1.2.3