Feature/update project configuration (trustwallet#890)

* Modify: Makefile to Use Bundler Force Makefile commands use bundler to keep consistent environment. * Update: Gems
bagyaru · Aug 21, 2018 · 1d6d065 · 1d6d065
1 parent ee40dac
commit 1d6d065
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 44 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -16,10 +16,10 @@ GEM
       cork
       nap
       open4 (~> 1.3)
-    cocoapods (1.5.0)
+    cocoapods (1.5.3)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.5.0)
+      cocoapods-core (= 1.5.3)
       cocoapods-deintegrate (>= 1.0.2, < 2.0)
       cocoapods-downloader (>= 1.2.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -35,12 +35,12 @@ GEM
       nap (~> 1.0)
       ruby-macho (~> 1.1)
       xcodeproj (>= 1.5.7, < 2.0)
-    cocoapods-core (1.5.0)
+    cocoapods-core (1.5.3)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.2)
-    cocoapods-downloader (1.2.0)
+    cocoapods-downloader (1.2.1)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
@@ -56,7 +56,7 @@ GEM
     concurrent-ruby (1.0.5)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (5.5.11)
+    danger (5.6.4)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -68,19 +68,19 @@ GEM
       no_proxy_fix
       octokit (~> 4.7)
       terminal-table (~> 1)
-    danger-swiftlint (0.16.0)
+    danger-swiftlint (0.17.3)
       danger
       rake (> 10)
       thor (~> 0.19)
     declarative (0.0.10)
     declarative-option (0.1.0)
-    domain_name (0.5.20170404)
+    domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.2.2)
+    dotenv (2.5.0)
     emoji_regex (0.1.1)
     escape (0.0.4)
     excon (0.62.0)
-    faraday (0.14.0)
+    faraday (0.15.2)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
@@ -89,8 +89,8 @@ GEM
       faraday (~> 0.8)
     faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
-    fastimage (2.1.1)
-    fastlane (2.91.0)
+    fastimage (2.1.3)
+    fastlane (2.101.1)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
@@ -105,7 +105,7 @@ GEM
       faraday_middleware (~> 0.9)
       fastimage (>= 2.1.0, < 3.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
-      google-api-client (>= 0.13.1, < 0.14.0)
+      google-api-client (>= 0.21.2, < 0.24.0)
       highline (>= 1.7.2, < 2.0.0)
       json (< 3.0.0)
       mini_magick (~> 4.5.1)
@@ -114,7 +114,7 @@ GEM
       multipart-post (~> 2.0.0)
       plist (>= 3.1.0, < 4.0.0)
       public_suffix (~> 2.0.0)
-      rubyzip (>= 1.1.0, < 2.0.0)
+      rubyzip (>= 1.2.1, < 2.0.0)
       security (= 0.1.3)
       simctl (~> 1.6.3)
       slack-notifier (>= 2.0.0, < 3.0.0)
@@ -124,26 +124,25 @@ GEM
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.5.7, < 2.0.0)
-      xcpretty (>= 0.2.4, < 1.0.0)
+      xcpretty (~> 0.2.8)
       xcpretty-travis-formatter (>= 0.0.3)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    git (1.3.0)
-    google-api-client (0.13.6)
+    git (1.4.0)
+    google-api-client (0.23.4)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 0.5)
+      googleauth (>= 0.5, < 0.7.0)
       httpclient (>= 2.8.1, < 3.0)
       mime-types (~> 3.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-    googleauth (0.6.2)
+    googleauth (0.6.3)
       faraday (~> 0.12)
       jwt (>= 1.4, < 3.0)
-      logging (~> 2.0)
       memoist (~> 0.12)
       multi_json (~> 1.11)
-      os (~> 0.9)
+      os (>= 0.9, < 2.0)
       signet (~> 0.7)
     highline (1.7.10)
     http-cookie (1.0.3)
@@ -153,11 +152,7 @@ GEM
       concurrent-ruby (~> 1.0)
     json (2.1.0)
     jwt (2.1.0)
-    kramdown (1.16.2)
-    little-plugger (1.1.4)
-    logging (2.2.2)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.10)
+    kramdown (1.17.0)
     memoist (0.16.0)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
@@ -168,25 +163,25 @@ GEM
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    nanaimo (0.2.5)
+    nanaimo (0.2.6)
     nap (1.1.0)
-    naturally (2.1.0)
+    naturally (2.2.0)
     netrc (0.11.0)
     no_proxy_fix (0.1.2)
-    octokit (4.8.0)
+    octokit (4.9.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
-    os (0.9.6)
+    os (1.0.0)
     plist (3.4.0)
     public_suffix (2.0.5)
     rake (12.3.1)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
-    retriable (3.1.1)
+    retriable (3.1.2)
     rouge (2.0.7)
-    ruby-macho (1.1.0)
+    ruby-macho (1.2.0)
     rubyzip (1.2.1)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
@@ -197,7 +192,7 @@ GEM
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simctl (1.6.3)
+    simctl (1.6.5)
       CFPropertyList
       naturally
     slack-notifier (2.3.2)
@@ -206,8 +201,8 @@ GEM
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.20.0)
     thread_safe (0.3.6)
-    tty-cursor (0.5.0)
-    tty-screen (0.6.4)
+    tty-cursor (0.6.0)
+    tty-screen (0.6.5)
     tty-spinner (0.8.0)
       tty-cursor (>= 0.5.0)
     tzinfo (1.2.5)
@@ -216,14 +211,14 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    unicode-display_width (1.3.0)
+    unicode-display_width (1.4.0)
     word_wrap (1.0.0)
-    xcodeproj (1.5.7)
+    xcodeproj (1.5.9)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.2)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.4)
+      nanaimo (~> 0.2.5)
     xcpretty (0.2.8)
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.0)

diff --git a/Makefile b/Makefile
@@ -1,24 +1,34 @@
 .DEFAULT_GOAL := bootstrap
 
-exists_pod = $(shell command -v pod 2> /dev/null)
+exists_bundler = $(shell command -v bundle 2> /dev/null)
+bundle_check = $(shell bundle check 1> /dev/null; echo $$?)
 
 install_env:
 
-ifeq "${exists_pod}" ""
-	sudo gem install cocoapods
+ifeq "${exists_bundler}" ""
+	sudo gem install bundler
 endif
 
 	@echo "All dependencies was installed"
 
 install:
 
-ifeq "${exists_pod}" ""
-	@echo "Cocopods is not installed. Use `make install_env`"
+ifeq "${exists_bundler}" ""
+	@echo "Bundler is not installed. Use `make install_env`"
 endif
 
-	pod install --repo-update
+ifneq ($(bundle_check), 0)
+	bundle install
+endif
+
+	bundle exec pod install --repo-update
 
 bootstrap: install
 
 release:
-	fastlane release
+
+ifeq "${exists_bundler}" ""
+	@echo "Bundler is not installed. Use `make install_env`"
+endif
+
+	bundle exec fastlane release