From 4919634a8fd9b3315614fb08d4ce801e6fd611d5 Mon Sep 17 00:00:00 2001
From: Christian Pauly <christian-pauly@posteo.de>
Date: Sun, 22 Nov 2020 09:39:46 +0100
Subject: [PATCH] fix fastlane

---
 .gitignore                         |  1 +
 android/fastlane/README.md         | 39 ++++++++++++++++++++++++++++++
 android/fastlane/report.xml        | 23 ++++++++++++++++++
 pubspec.yaml                       |  2 +-
 scripts/prepare-android-release.sh | 14 ++++++-----
 scripts/release-playstore-beta.sh  |  2 +-
 6 files changed, 73 insertions(+), 8 deletions(-)
 create mode 100644 android/fastlane/README.md
 create mode 100644 android/fastlane/report.xml

diff --git a/.gitignore b/.gitignore
index 921cc189..9d45b5ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,4 +49,5 @@ lib/generated_plugin_registrant.dart
 **/android/app/.cxx
 android/key.jks
 android/keys.json
+android/Gemfile.lock
 lib/l10n_old
\ No newline at end of file
diff --git a/android/fastlane/README.md b/android/fastlane/README.md
new file mode 100644
index 00000000..5a466743
--- /dev/null
+++ b/android/fastlane/README.md
@@ -0,0 +1,39 @@
+fastlane documentation
+================
+# Installation
+
+Make sure you have the latest version of the Xcode command line tools installed:
+
+```
+xcode-select --install
+```
+
+Install _fastlane_ using
+```
+[sudo] gem install fastlane -NV
+```
+or alternatively using `brew install fastlane`
+
+# Available Actions
+## Android
+### android set_build_code_beta
+```
+fastlane android set_build_code_beta
+```
+
+### android deploy_beta_test
+```
+fastlane android deploy_beta_test
+```
+
+### android deploy_release
+```
+fastlane android deploy_release
+```
+
+
+----
+
+This README.md is auto-generated and will be re-generated every time [fastlane](https://fastlane.tools) is run.
+More information about fastlane can be found on [fastlane.tools](https://fastlane.tools).
+The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools).
diff --git a/android/fastlane/report.xml b/android/fastlane/report.xml
new file mode 100644
index 00000000..f55cba0e
--- /dev/null
+++ b/android/fastlane/report.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuites>
+  <testsuite name="fastlane.lanes">
+    
+    
+    
+      
+      <testcase classname="fastlane.lanes" name="0: update_fastlane" time="0.094148">
+        
+      </testcase>
+    
+      
+      <testcase classname="fastlane.lanes" name="1: default_platform" time="0.000809">
+        
+      </testcase>
+    
+      
+      <testcase classname="fastlane.lanes" name="2: google_play_track_version_codes" time="1.408525">
+        
+      </testcase>
+    
+  </testsuite>
+</testsuites>
diff --git a/pubspec.yaml b/pubspec.yaml
index 8eb4b7aa..33c4db2a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: fluffychat
 description: Chat with your friends.
 publish_to: none
-version: 0.22.1+50
+version: 0.22.1+510
 
 environment:
   sdk: ">=2.6.0 <3.0.0"
diff --git a/scripts/prepare-android-release.sh b/scripts/prepare-android-release.sh
index 87b065a4..d9a43c27 100755
--- a/scripts/prepare-android-release.sh
+++ b/scripts/prepare-android-release.sh
@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
-cd android && echo $FDROID_KEY | base64 --decode --ignore-garbage > key.jks && cd ..
-cd android && echo "storePassword=${FDROID_KEY_PASS}" >> key.properties && cd ..
-cd android && echo "keyPassword=${FDROID_KEY_PASS}" >> key.properties && cd ..
-cd android && echo "keyAlias=key" >> key.properties && cd ..
-cd android && echo "storeFile=../key.jks" >> key.properties && cd ..
-#cd android/app && echo $GOOGLE_SERVICES >> google-services.json && cd ../..
+cd android
+echo $FDROID_KEY | base64 --decode --ignore-garbage > key.jks
+echo "storePassword=${FDROID_KEY_PASS}" >> key.properties
+echo "keyPassword=${FDROID_KEY_PASS}" >> key.properties
+echo "keyAlias=key" >> key.properties
+echo "storeFile=../key.jks" >> key.properties
+cd app && echo $GOOGLE_SERVICES >> google-services.json/..
+cd ../..
\ No newline at end of file
diff --git a/scripts/release-playstore-beta.sh b/scripts/release-playstore-beta.sh
index 37024baa..8dc8f4f9 100755
--- a/scripts/release-playstore-beta.sh
+++ b/scripts/release-playstore-beta.sh
@@ -5,7 +5,7 @@ flutter pub get
 cd android
 bundle install
 bundle update fastlane
-#echo $PLAYSTORE_DEPLOY_KEY >> keys.json
+echo $PLAYSTORE_DEPLOY_KEY >> keys.json
 bundle exec fastlane set_build_code_beta
 cd ..
 flutter build appbundle --target-platform android-arm,android-arm64,android-x64