Land #9647, lock protobuf version

2018-03-01 14:08:15 -06:00 · 2018-03-01 14:08:15 -06:00 · 34b90ee494
parent 883654f0ea b90f960edd
commit 34b90ee494
2 changed files with 5 additions and 1 deletions
--- a/4
+++ b/4
@ -23,6 +23,10 @@ group :development do
    'x86-mingw32', 'x64-mingw32',
    'x86_64-linux', 'x86-linux',
    'darwin'].include?(RUBY_PLATFORM.gsub(/.*darwin.*/, 'darwin'))
+  gem 'google-protobuf', "3.5.1" if [
+    'x86-mingw32', 'x64-mingw32',
+    'x86_64-linux', 'x86-linux',
+    'darwin'].include?(RUBY_PLATFORM.gsub(/.*darwin.*/, 'darwin'))
 end

 group :development, :test do
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -129,7 +129,7 @@ GEM
      multipart-post (>= 1.2, < 3)
    filesize (0.1.1)
    fivemat (1.3.5)
-    google-protobuf (3.5.1.2)
+    google-protobuf (3.5.1)
    googleapis-common-protos-types (1.0.1)
      google-protobuf (~> 3.0)
    googleauth (0.6.2)