From 11d81b9b6b618101211dbf4ef537e9d23193bc31 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Fri, 28 Sep 2018 14:48:31 -0300
Subject: [PATCH] Fastlane (#2190)

* Have fastlane use BRANCH_TO_BUILD

* Update fastlane
---
 fastlane/Fastfile     | 16 ++++++++++++++--
 fastlane/Gemfile.lock | 18 +++++++++---------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 2a8e70f72..cca877c8f 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -8,6 +8,10 @@ skip_docs
 
 platform :ios do
   before_all do |lane|
+    unless ENV['BRANCH_TO_BUILD'].nil? || ENV['BRANCH_TO_BUILD'].empty?
+      sh "git checkout #{ENV['BRANCH_TO_BUILD']}"
+    end
+
     unless ENV['GIT_LOCAL_BRANCH'].nil? || ENV['GIT_LOCAL_BRANCH'].empty?
         sh "git checkout -b #{ENV['GIT_LOCAL_BRANCH']}"
     end
@@ -20,7 +24,9 @@ platform :ios do
           skip_clean: true
       )
 
-      sh 'git checkout master'
+      branch = ENV['BRANCH_TO_BUILD'] || 'master'
+
+      sh "git checkout #{branch}"
     end
   end
 
@@ -260,6 +266,10 @@ end
 
 platform :android do
   before_all do |lane|
+    unless ENV['BRANCH_TO_BUILD'].nil? || ENV['BRANCH_TO_BUILD'].empty?
+      sh "git checkout #{ENV['BRANCH_TO_BUILD']}"
+    end
+
     unless ENV['GIT_LOCAL_BRANCH'].nil? || ENV['GIT_LOCAL_BRANCH'].empty?
       sh "git checkout -b #{ENV['GIT_LOCAL_BRANCH']}"
     end
@@ -280,7 +290,9 @@ platform :android do
           skip_clean: true
       )
 
-      sh 'git checkout master'
+      branch = ENV['BRANCH_TO_BUILD'] || 'master'
+
+      sh "git checkout #{branch}"
     end
   end
 
diff --git a/fastlane/Gemfile.lock b/fastlane/Gemfile.lock
index af7512ca5..885850362 100644
--- a/fastlane/Gemfile.lock
+++ b/fastlane/Gemfile.lock
@@ -6,8 +6,8 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     atomos (0.1.3)
     aws-eventstream (1.0.1)
-    aws-partitions (1.103.0)
-    aws-sdk-core (3.27.0)
+    aws-partitions (1.105.0)
+    aws-sdk-core (3.28.0)
       aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
@@ -15,7 +15,7 @@ GEM
     aws-sdk-kms (1.9.0)
       aws-sdk-core (~> 3, >= 3.26.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.19.0)
+    aws-sdk-s3 (1.20.0)
       aws-sdk-core (~> 3, >= 3.26.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.0)
@@ -33,15 +33,15 @@ GEM
     dotenv (2.5.0)
     emoji_regex (0.1.1)
     excon (0.62.0)
-    faraday (0.15.2)
+    faraday (0.15.3)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    fastimage (2.1.3)
-    fastlane (2.103.1)
+    fastimage (2.1.4)
+    fastlane (2.105.2)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
@@ -65,7 +65,7 @@ GEM
       multipart-post (~> 2.0.0)
       plist (>= 3.1.0, < 4.0.0)
       public_suffix (~> 2.0.0)
-      rubyzip (>= 1.2.1, < 2.0.0)
+      rubyzip (>= 1.2.2, < 2.0.0)
       security (= 0.1.3)
       simctl (~> 1.6.3)
       slack-notifier (>= 2.0.0, < 3.0.0)
@@ -82,7 +82,7 @@ GEM
       nokogiri
     fastlane-plugin-find_replace_string (0.1.0)
     gh_inspector (1.1.3)
-    google-api-client (0.23.8)
+    google-api-client (0.23.9)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.5, < 0.7.0)
       httpclient (>= 2.8.1, < 3.0)
@@ -128,7 +128,7 @@ GEM
     rouge (2.0.7)
     rubyzip (1.2.2)
     security (0.1.3)
-    signet (0.9.1)
+    signet (0.10.0)
       addressable (~> 2.3)
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)