From 9de5683a73ef9731eaea181f3b47d7f06d85453f Mon Sep 17 00:00:00 2001
From: Josep Jaume Rey Peroy <josepjaume@gmail.com>
Date: Wed, 7 Jun 2017 14:21:34 +0200
Subject: [PATCH] Relax dependencies

---
 .ruby-version                 |   1 +
 Gemfile.lock                  | 281 +++++++++++++++++-----------------
 decidim-deploy-heroku.gemspec |   3 +-
 lib/decidim/deploy/heroku.rb  |   8 -
 4 files changed, 143 insertions(+), 150 deletions(-)
 create mode 100644 .ruby-version

diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 0000000..005119b
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+2.4.1
diff --git a/Gemfile.lock b/Gemfile.lock
index 18fa92b..690001a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,31 +2,30 @@ PATH
   remote: .
   specs:
     decidim-deploy-heroku (0.0.1)
-      decidim (= 0.0.6)
-      thor (~> 0.19.4)
+      decidim (~> 0.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.2)
-      actionpack (= 5.0.2)
+    actioncable (5.0.3)
+      actionpack (= 5.0.3)
       nio4r (>= 1.2, < 3.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.2)
-      actionpack (= 5.0.2)
-      actionview (= 5.0.2)
-      activejob (= 5.0.2)
+    actionmailer (5.0.3)
+      actionpack (= 5.0.3)
+      actionview (= 5.0.3)
+      activejob (= 5.0.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.2)
-      actionview (= 5.0.2)
-      activesupport (= 5.0.2)
+    actionpack (5.0.3)
+      actionview (= 5.0.3)
+      activesupport (= 5.0.3)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.2)
-      activesupport (= 5.0.2)
+    actionview (5.0.3)
+      activesupport (= 5.0.3)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
@@ -34,24 +33,24 @@ GEM
     active_link_to (1.0.4)
       actionpack
       addressable
-    activejob (5.0.2)
-      activesupport (= 5.0.2)
+    activejob (5.0.3)
+      activesupport (= 5.0.3)
       globalid (>= 0.3.6)
-    activemodel (5.0.2)
-      activesupport (= 5.0.2)
-    activerecord (5.0.2)
-      activemodel (= 5.0.2)
-      activesupport (= 5.0.2)
+    activemodel (5.0.3)
+      activesupport (= 5.0.3)
+    activerecord (5.0.3)
+      activemodel (= 5.0.3)
+      activesupport (= 5.0.3)
       arel (~> 7.0)
-    activesupport (5.0.2)
+    activesupport (5.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.0)
+    addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
     arel (7.1.4)
-    autoprefixer-rails (6.7.7.1)
+    autoprefixer-rails (7.1.1)
       execjs
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
@@ -63,143 +62,143 @@ GEM
       execjs (~> 2.0)
     bcrypt (3.1.11)
     builder (3.2.3)
-    cancancan (1.16.0)
-    carrierwave (1.0.0)
+    cancancan (2.0.0)
+    carrierwave (1.1.0)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    coffee-rails (4.2.1)
+    coffee-rails (4.2.2)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.2.x)
+      railties (>= 4.0.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.0.5)
-    css_parser (1.4.10)
+    css_parser (1.5.0)
       addressable
     date_validator (0.9.0)
       activemodel
       activesupport
-    decidim (0.0.6)
-      decidim-admin (= 0.0.6)
-      decidim-api (= 0.0.6)
-      decidim-budgets (= 0.0.6)
-      decidim-comments (= 0.0.6)
-      decidim-core (= 0.0.6)
-      decidim-meetings (= 0.0.6)
-      decidim-pages (= 0.0.6)
-      decidim-proposals (= 0.0.6)
-      decidim-results (= 0.0.6)
-      decidim-system (= 0.0.6)
+    decidim (0.2.0)
+      decidim-admin (= 0.2.0)
+      decidim-api (= 0.2.0)
+      decidim-budgets (= 0.2.0)
+      decidim-comments (= 0.2.0)
+      decidim-core (= 0.2.0)
+      decidim-meetings (= 0.2.0)
+      decidim-pages (= 0.2.0)
+      decidim-proposals (= 0.2.0)
+      decidim-results (= 0.2.0)
+      decidim-system (= 0.2.0)
       rails (~> 5.0.2)
       rails-i18n (~> 5.0.2)
-    decidim-admin (0.0.6)
+    decidim-admin (0.2.0)
       active_link_to (~> 1.0.0)
-      carrierwave (~> 1.0.0.rc)
-      decidim-core (= 0.0.6)
+      decidim-core (= 0.2.0)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       devise_invitable (~> 1.7.0)
       foundation_rails_helper (~> 3.0.0.rc)
-      jquery-rails (~> 4.2.2)
+      jquery-rails (~> 4.3.1)
       rails (~> 5.0.2)
-      rectify (~> 0.8.0)
+      rectify (~> 0.9.1)
       sassc-rails (~> 1.3.0)
-    decidim-api (0.0.6)
+    decidim-api (0.2.0)
       graphiql-rails (~> 1.4.1)
-      graphql (~> 1.5.3)
+      graphql (~> 1.6.0)
       rack-cors (~> 0.4.0)
       rails (~> 5.0.2)
       sprockets-es6 (~> 0.9.2)
-    decidim-budgets (0.0.6)
-      decidim-comments (= 0.0.6)
-      decidim-core (= 0.0.6)
-      kaminari (~> 1.0.0.rc1)
-      rectify (~> 0.8)
+    decidim-budgets (0.2.0)
+      decidim-comments (= 0.2.0)
+      decidim-core (= 0.2.0)
+      kaminari (~> 1.0.1)
+      rectify (~> 0.9.1)
       searchlight (~> 4.1.0)
-    decidim-comments (0.0.6)
-      decidim-core (= 0.0.6)
+    decidim-comments (0.2.0)
+      decidim-core (= 0.2.0)
       jquery-rails (~> 4.0)
       rails (~> 5.0.2)
-    decidim-core (0.0.6)
-      active_link_to (~> 1.0.0)
-      autoprefixer-rails (~> 6.7, >= 6.7.4)
-      cancancan (~> 1.16.0)
-      carrierwave (~> 1.0.0)
+    decidim-core (0.2.0)
+      active_link_to (~> 1.0.4)
+      autoprefixer-rails (~> 7.1.1)
+      cancancan (~> 2.0.0)
+      carrierwave (~> 1.1.0)
       date_validator (~> 0.9.0)
-      decidim-api (= 0.0.6)
+      decidim-api (= 0.2.0)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       file_validators (~> 2.1.0)
-      foundation-rails (~> 6.3.0.0)
+      foundation-rails (~> 6.3.1.0)
       foundation_rails_helper (~> 3.0.0.rc)
       geocoder (~> 1.4.2)
       high_voltage (~> 3.0.0)
       invisible_captcha (~> 0.9.2)
-      jquery-rails (~> 4.2.2)
-      mini_magick (~> 4.6.1)
-      nokogiri (~> 1.7.0.1)
+      jquery-rails (~> 4.3.1)
+      mini_magick (~> 4.7.0)
+      nokogiri (~> 1.7.1)
       omniauth (~> 1.6.1)
       omniauth-facebook (~> 4.0.0)
-      omniauth-google-oauth2 (~> 0.4.1)
+      omniauth-google-oauth2 (~> 0.5.0)
       omniauth-twitter (~> 1.4.0)
-      pg (~> 0.19.0)
+      pg (~> 0.20.0)
       premailer-rails (~> 1.9.5)
       rails (~> 5.0.2)
-      rectify (~> 0.8.0)
+      rectify (~> 0.9.1)
       redis (~> 3.3.3)
+      rubyzip (= 1.2.1)
       sassc-rails (~> 1.3.0)
       sprockets-es6 (~> 0.9.2)
       truncato (~> 0.7.9)
-      wisper (~> 1.6.1)
-    decidim-meetings (0.0.6)
+      wisper (~> 2.0.0)
+    decidim-meetings (0.2.0)
       date_validator (~> 0.9)
-      decidim-core (= 0.0.6)
-      httparty (~> 0.14.0)
+      decidim-core (= 0.2.0)
+      httparty (~> 0.15.0)
       jquery-tmpl-rails (~> 1.1.0)
       kaminari (~> 1.0.1)
       rectify (~> 0.8)
       searchlight (~> 4.1.0)
-    decidim-pages (0.0.6)
-      decidim-comments (= 0.0.6)
-      decidim-core (= 0.0.6)
-      rectify (~> 0.8.0)
-    decidim-proposals (0.0.6)
-      decidim-comments (= 0.0.6)
-      decidim-core (= 0.0.6)
+    decidim-pages (0.2.0)
+      decidim-comments (= 0.2.0)
+      decidim-core (= 0.2.0)
+      rectify (~> 0.9.1)
+    decidim-proposals (0.2.0)
+      decidim-comments (= 0.2.0)
+      decidim-core (= 0.2.0)
       kaminari (~> 1.0.1)
-      rectify (~> 0.8.0)
-      social-share-button (~> 0.9.0)
-    decidim-results (0.0.6)
-      decidim-comments (= 0.0.6)
-      decidim-core (= 0.0.6)
-      kaminari (~> 1.0.0.rc1)
-      rectify (~> 0.8)
+      rectify (~> 0.9.1)
+      social-share-button (~> 0.10.0)
+    decidim-results (0.2.0)
+      decidim-comments (= 0.2.0)
+      decidim-core (= 0.2.0)
+      kaminari (~> 1.0.1)
+      rectify (~> 0.9.1)
       searchlight (~> 4.1.0)
-    decidim-system (0.0.6)
+    decidim-system (0.2.0)
       active_link_to (~> 1.0.0)
-      decidim-core (= 0.0.6)
+      decidim-core (= 0.2.0)
       devise (~> 4.2)
       devise-i18n (~> 1.1.0)
       devise_invitable (~> 1.7.1)
       foundation_rails_helper (~> 3.0.0.rc)
-      jquery-rails (~> 4.2.2)
+      jquery-rails (~> 4.3.1)
       rails (~> 5.0.2)
-      rectify (~> 0.8.0)
+      rectify (~> 0.9.1)
       sassc-rails (~> 1.3.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devise (4.2.1)
+    devise (4.3.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.1)
+      railties (>= 4.1.0, < 5.2)
       responders
       warden (~> 1.2.3)
     devise-i18n (1.1.2)
-    devise_invitable (1.7.1)
+    devise_invitable (1.7.2)
       actionmailer (>= 4.1.0)
       devise (>= 4.0.0)
     diff-lcs (1.3)
@@ -212,32 +211,32 @@ GEM
     file_validators (2.1.0)
       activemodel (>= 3.0)
       mime-types (>= 1.0)
-    foundation-rails (6.3.0.0)
+    foundation-rails (6.3.1.0)
       railties (>= 3.1.0)
       sass (>= 3.3.0, < 3.5)
       sprockets-es6 (>= 0.9.0)
-    foundation_rails_helper (3.0.0.rc2)
-      actionpack (>= 4.1)
-      activemodel (>= 4.1)
-      activesupport (>= 4.1)
-      railties (>= 4.1)
+    foundation_rails_helper (3.0.0)
+      actionpack (>= 4.1, < 6.0)
+      activemodel (>= 4.1, < 6.0)
+      activesupport (>= 4.1, < 6.0)
+      railties (>= 4.1, < 6.0)
       tzinfo (~> 1.2, >= 1.2.2)
-    geocoder (1.4.3)
-    globalid (0.3.7)
-      activesupport (>= 4.1.0)
+    geocoder (1.4.4)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
     graphiql-rails (1.4.1)
       rails
-    graphql (1.5.4)
+    graphql (1.6.2)
     hashie (3.5.5)
     high_voltage (3.0.0)
     htmlentities (4.3.4)
-    httparty (0.14.0)
+    httparty (0.15.5)
       multi_xml (>= 0.5.2)
-    i18n (0.8.1)
+    i18n (0.8.4)
     ice_nine (0.11.2)
     invisible_captcha (0.9.2)
       rails (>= 3.2.0)
-    jquery-rails (4.2.2)
+    jquery-rails (4.3.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -258,22 +257,22 @@ GEM
     kaminari-core (1.0.1)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.4)
+    mail (2.6.5)
       mime-types (>= 1.16, < 4)
     method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_magick (4.6.1)
+    mini_magick (4.7.0)
     mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    minitest (5.10.2)
     multi_json (1.12.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    nio4r (2.0.0)
-    nokogiri (1.7.0.1)
+    nio4r (2.1.0)
+    nokogiri (1.7.2)
       mini_portile2 (~> 2.1.0)
-    oauth (0.5.1)
+    oauth (0.5.3)
     oauth2 (1.3.1)
       faraday (>= 0.8, < 0.12)
       jwt (~> 1.0)
@@ -285,8 +284,8 @@ GEM
       rack (>= 1.6.2, < 3)
     omniauth-facebook (4.0.0)
       omniauth-oauth2 (~> 1.2)
-    omniauth-google-oauth2 (0.4.1)
-      jwt (~> 1.5.2)
+    omniauth-google-oauth2 (0.5.0)
+      jwt (~> 1.5)
       multi_json (~> 1.3)
       omniauth (>= 1.1.1)
       omniauth-oauth2 (>= 1.3.1)
@@ -300,55 +299,56 @@ GEM
       omniauth-oauth (~> 1.1)
       rack
     orm_adapter (0.5.0)
-    pg (0.19.0)
-    premailer (1.10.2)
+    pg (0.20.0)
+    premailer (1.10.4)
       addressable
       css_parser (>= 1.4.10)
       htmlentities (>= 4.0.0)
-    premailer-rails (1.9.5)
+    premailer-rails (1.9.6)
       actionmailer (>= 3, < 6)
       premailer (~> 1.7, >= 1.7.9)
     public_suffix (2.0.5)
-    rack (2.0.1)
+    rack (2.0.3)
     rack-cors (0.4.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.2)
-      actioncable (= 5.0.2)
-      actionmailer (= 5.0.2)
-      actionpack (= 5.0.2)
-      actionview (= 5.0.2)
-      activejob (= 5.0.2)
-      activemodel (= 5.0.2)
-      activerecord (= 5.0.2)
-      activesupport (= 5.0.2)
+    rails (5.0.3)
+      actioncable (= 5.0.3)
+      actionmailer (= 5.0.3)
+      actionpack (= 5.0.3)
+      actionview (= 5.0.3)
+      activejob (= 5.0.3)
+      activemodel (= 5.0.3)
+      activerecord (= 5.0.3)
+      activesupport (= 5.0.3)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.2)
+      railties (= 5.0.3)
       sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.2)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    rails-i18n (5.0.3)
+    rails-i18n (5.0.4)
       i18n (~> 0.7)
       railties (~> 5.0)
-    railties (5.0.2)
-      actionpack (= 5.0.2)
-      activesupport (= 5.0.2)
+    railties (5.0.3)
+      actionpack (= 5.0.3)
+      activesupport (= 5.0.3)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (12.0.0)
-    rectify (0.8.0)
+    rectify (0.9.1)
       activemodel (>= 4.1.0)
       activerecord (>= 4.1.0)
       activesupport (>= 4.1.0)
       virtus (~> 1.0.5)
       wisper (>= 1.6.1)
     redis (3.3.3)
-    responders (2.3.0)
-      railties (>= 4.2.0, < 5.1)
+    responders (2.4.0)
+      actionpack (>= 4.2.0, < 5.3)
+      railties (>= 4.2.0, < 5.3)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -362,7 +362,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
-    sass (3.4.23)
+    rubyzip (1.2.1)
+    sass (3.4.24)
     sassc (1.11.2)
       bundler
       ffi (~> 1.9.6)
@@ -375,7 +376,7 @@ GEM
       sprockets-rails
       tilt
     searchlight (4.1.0)
-    social-share-button (0.9.0)
+    social-share-button (0.10.0)
       coffee-rails
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
@@ -406,7 +407,7 @@ GEM
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
-    wisper (1.6.1)
+    wisper (2.0.0)
 
 PLATFORMS
   ruby
@@ -418,4 +419,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.13.7
+   1.15.1
diff --git a/decidim-deploy-heroku.gemspec b/decidim-deploy-heroku.gemspec
index d97ecbc..e5bc3c8 100644
--- a/decidim-deploy-heroku.gemspec
+++ b/decidim-deploy-heroku.gemspec
@@ -19,8 +19,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|decidim-core)/}) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rails", Decidim::Deploy::Heroku.rails_version
-  spec.add_dependency "decidim", Decidim::Deploy::Heroku.decidim_version
+  spec.add_dependency "decidim", "~> 0.1"
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 12.0.0"
diff --git a/lib/decidim/deploy/heroku.rb b/lib/decidim/deploy/heroku.rb
index 1a15366..3a9600e 100644
--- a/lib/decidim/deploy/heroku.rb
+++ b/lib/decidim/deploy/heroku.rb
@@ -7,14 +7,6 @@ def self.version
         "0.0.1"
       end
 
-      def self.decidim_version
-        "0.0.6"
-      end
-
-      def self.rails_version
-        "~> 5.0.2"
-      end
-
       def self.install
         HerokuInstaller.install
       end