diff --git a/Gemfile b/Gemfile index 4688c8fae1..1e7f58cdb3 100644 --- a/Gemfile +++ b/Gemfile @@ -55,7 +55,7 @@ end gem 'cartodb-common', git: 'https://github.com/cartodb/cartodb-common.git', - tag: 'v1.0.1' + tag: 'v1.1.0-dev' gem 'roo', '1.13.2' gem 'state_machines-activerecord', '~> 0.5.0' gem 'typhoeus', '1.3.1' diff --git a/Gemfile.lock b/Gemfile.lock index 8eb67552f3..caf0c986c8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,12 +8,13 @@ GIT GIT remote: https://github.com/cartodb/cartodb-common.git - revision: 8c86ac330a4c360b6b89da2609bf9216fffbd246 - tag: v1.0.1 + revision: 2dc6a318bdf4f84dc3da56b7f784060bc38d165f + tag: v1.1.0-dev specs: cartodb-common (1.0.1) argon2 (~> 2) google-cloud-pubsub (~> 2.3) + google-cloud-resource_manager rails (>= 4, < 6) rollbar @@ -130,7 +131,7 @@ GEM sass (>= 3.3.0, < 3.5) compass-import-once (1.0.5) sass (>= 3.2, < 3.5) - concurrent-ruby (1.1.7) + concurrent-ruby (1.1.8) coverband (5.0.0) redis crass (1.0.6) @@ -209,10 +210,14 @@ GEM concurrent-ruby (~> 1.1) google-cloud-core (~> 1.5) google-cloud-pubsub-v1 (~> 0.0) - google-cloud-pubsub-v1 (0.2.0) + google-cloud-pubsub-v1 (0.2.1) gapic-common (~> 0.3) google-cloud-errors (~> 1.0) grpc-google-iam-v1 (>= 0.6.10, < 2.0) + google-cloud-resource_manager (0.34.0) + google-api-client (~> 0.33) + google-cloud-core (~> 1.2) + googleauth (~> 0.9) google-protobuf (3.14.0) googleapis-common-protos (1.3.10) google-protobuf (~> 3.11) @@ -227,8 +232,8 @@ GEM multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (~> 0.12) - grpc (1.34.0) - google-protobuf (~> 3.13) + grpc (1.35.0) + google-protobuf (~> 3.14) googleapis-common-protos-types (~> 1.0) grpc-google-iam-v1 (0.6.10) google-protobuf (~> 3.11) @@ -478,7 +483,7 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (1.0.1) + thor (1.1.0) thread_safe (0.3.6) tilt (2.0.10) trollop (2.9.10)