From 62fd2435b7eeef39f67b5d98f6b3063bb1de2f26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aivils=20=C5=A0toss?= Date: Wed, 28 Mar 2018 14:44:04 +0300 Subject: [PATCH] Dependencies updated --- .gitignore | 3 ++- Gemfile | 5 +---- Gemfile.lock | 53 +++++++++++++++++++++++----------------------------- 3 files changed, 26 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index a8c8576..aa568f4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -config/config.yml \ No newline at end of file +config/config.yml +.ruby-version diff --git a/Gemfile b/Gemfile index 71fd86e..9e04665 100644 --- a/Gemfile +++ b/Gemfile @@ -7,8 +7,5 @@ gem 'sinatra-activerecord' gem 'async_sinatra' gem 'money' gem 'possibly', '~> 0.2.0' -gem 'paypal-sdk-permissions', - :git => 'git://github.com/paypal/permissions-sdk-ruby.git', - :branch => 'master', - :ref => 'c0240bee9f94fe6338d67b4f754e1a11ce81619a' +gem 'paypal-sdk-permissions', '~> 1.96.4' gem 'paypal-sdk-merchant', '~> 1.116.0' diff --git a/Gemfile.lock b/Gemfile.lock index fa0742b..0933af7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,50 +1,40 @@ -GIT - remote: git://github.com/paypal/permissions-sdk-ruby.git - revision: c0240bee9f94fe6338d67b4f754e1a11ce81619a - ref: c0240bee9f94fe6338d67b4f754e1a11ce81619a - branch: master - specs: - paypal-sdk-permissions (1.96.3) - paypal-sdk-core (~> 0.3.0) - GEM remote: https://rubygems.org/ specs: - activemodel (4.2.0) - activesupport (= 4.2.0) - builder (~> 3.1) - activerecord (4.2.0) - activemodel (= 4.2.0) - activesupport (= 4.2.0) - arel (~> 6.0) - activesupport (4.2.0) + activemodel (5.1.5) + activesupport (= 5.1.5) + activerecord (5.1.5) + activemodel (= 5.1.5) + activesupport (= 5.1.5) + arel (~> 8.0) + activesupport (5.1.5) + concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - arel (6.0.0) + arel (8.0.0) async_sinatra (1.1.0) rack (>= 1.4.1) sinatra (>= 1.3.2) - builder (3.2.2) + concurrent-ruby (1.0.5) daemons (1.1.9) eventmachine (1.0.7) i18n (0.7.0) - json (1.8.2) - minitest (5.5.1) + minitest (5.11.3) money (6.5.1) i18n (>= 0.6.4, <= 0.7.0) - multi_json (1.11.0) + multi_json (1.13.1) mysql2 (0.3.16) - paypal-sdk-core (0.3.1) + paypal-sdk-core (0.3.4) multi_json (~> 1.0) xml-simple paypal-sdk-merchant (1.116.0) paypal-sdk-core (~> 0.3.0) + paypal-sdk-permissions (1.96.4) + paypal-sdk-core (~> 0.3.0) possibly (0.2.0) - rack (1.6.0) - rack-protection (1.5.3) + rack (1.6.9) + rack-protection (1.5.5) rack sinatra (1.4.5) rack (~> 1.4) @@ -57,9 +47,9 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0) rack (~> 1.0) - thread_safe (0.3.4) + thread_safe (0.3.6) tilt (1.4.1) - tzinfo (1.2.2) + tzinfo (1.2.5) thread_safe (~> 0.1) xml-simple (1.1.5) @@ -71,8 +61,11 @@ DEPENDENCIES money mysql2 paypal-sdk-merchant (~> 1.116.0) - paypal-sdk-permissions! + paypal-sdk-permissions (~> 1.96.4) possibly (~> 0.2.0) sinatra (~> 1.4.5) sinatra-activerecord thin + +BUNDLED WITH + 1.15.4