From dfd2c605091fb14673482a820bcda412590c764e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Tue, 15 Nov 2016 09:49:00 +0200
Subject: [PATCH] travis, build: fix mobile build issues on travis

---
 .travis.yml        | 1 +
 build/mvn.settings | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 44f3d5507f..e2d8114110 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -68,6 +68,7 @@ matrix:
         - go run build/ci.go archive -type tar -signer OSX_SIGNING_KEY -upload gethstore/builds
 
         # Build the iOS framework and upload it to CocoaPods and Azure
+        - gem uninstall cocoapods -a
         - gem install cocoapods --pre
         - travis_wait 30 go run build/ci.go xcode -signer IOS_SIGNING_KEY -deploy trunk -upload gethstore/builds
 
diff --git a/build/mvn.settings b/build/mvn.settings
index 406b409b9b..8d06c048ee 100644
--- a/build/mvn.settings
+++ b/build/mvn.settings
@@ -16,7 +16,7 @@
         <activeByDefault>true</activeByDefault>
       </activation>
       <properties>
-        <gpg.executable>gpg</gpg.executable>
+        <gpg.executable>gpg2</gpg.executable>
         <gpg.passphrase></gpg.passphrase>
       </properties>
     </profile>