From 09327cf1ce09954654cbf689795eebab1cd7972b Mon Sep 17 00:00:00 2001 From: Benoit Molenda Date: Wed, 13 Jul 2016 18:40:37 +0200 Subject: [PATCH] update constraints backbone < v1 , marionette < v2 * post B v1, starting event change * post M v2, itemView prop change to childView --- Gemfile | 20 +++++-- Gemfile.lock | 132 ++++++++++++++++++++++++++-------------------- live_logs.gemspec | 4 +- 3 files changed, 94 insertions(+), 62 deletions(-) diff --git a/Gemfile b/Gemfile index b78bc72..c0d3308 100644 --- a/Gemfile +++ b/Gemfile @@ -10,9 +10,24 @@ gemspec # Git. Remember to move these dependencies to your gemspec before releasing # your gem to rubygems.org. -ruby '2.0.0' +#ruby '2.0.0' gem 'passenger' +gem 'foundation-rails', '>5.0.0' +gem 'font-awesome-rails' +gem 'haml-rails' +gem 'sass-rails', '>= 4.0.0' +gem 'uglifier', '>= 1.3.0' +gem 'coffee-rails', '>= 4.0.0' +gem 'haml_coffee_assets' + +# Use jquery as the JavaScript library +gem 'jquery-rails' +gem 'marionette-rails', '< 2' +gem 'backbone-on-rails', '< 1' +gem 'high_voltage' + +gem 'file-tail' group :doc do # bundle exec rake doc:rails generates the API under doc/api. @@ -20,5 +35,4 @@ group :doc do end # Use debugger -gem 'debugger', group: [:development, :test] - +#gem 'debugger', group: [:development, :test] diff --git a/Gemfile.lock b/Gemfile.lock index 6268f44..4cf686f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,8 +2,8 @@ PATH remote: . specs: live_logs (0.0.1) - backbone-on-rails - coffee-rails (~> 4.0.0) + backbone-on-rails (< 1) + coffee-rails (>= 4.0.0) decent_exposure file-tail font-awesome-rails @@ -12,9 +12,9 @@ PATH haml_coffee_assets high_voltage jquery-rails - marionette-rails - rails (~> 4.0.2) - sass-rails (~> 4.0.0) + marionette-rails (< 2.2.0) + rails (>= 4.0.2) + sass-rails (>= 4.0.0) uglifier (>= 1.3.0) GEM @@ -37,37 +37,30 @@ GEM activerecord-deprecated_finders (~> 1.0.2) activesupport (= 4.0.2) arel (~> 4.0.0) - activerecord-deprecated_finders (1.0.3) + activerecord-deprecated_finders (1.0.4) activesupport (4.0.2) i18n (~> 0.6, >= 0.6.4) minitest (~> 4.2) multi_json (~> 1.3) thread_safe (~> 0.1) tzinfo (~> 0.3.37) - arel (4.0.1) - atomic (1.1.14) - backbone-on-rails (1.1.0.0) + arel (4.0.2) + backbone-on-rails (0.9.10.0) eco ejs jquery-rails rails (>= 3.1) builder (3.1.4) - coffee-rails (4.0.1) + coffee-rails (4.2.1) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.0) - coffee-script (2.2.0) + railties (>= 4.0.0, < 5.2.x) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.6.3) - columnize (0.3.6) + coffee-script-source (1.10.0) daemon_controller (1.1.8) - debugger (1.6.5) - columnize (>= 0.3.1) - debugger-linecache (~> 1.2.0) - debugger-ruby_core_source (~> 1.3.1) - debugger-linecache (1.2.0) - debugger-ruby_core_source (1.3.1) - decent_exposure (2.3.0) + decent_exposure (3.0.0) + activesupport (>= 4.0) eco (1.0.0) coffee-script eco-source @@ -75,47 +68,58 @@ GEM eco-source (1.1.0.rc.1) ejs (1.1.1) erubis (2.7.0) - execjs (2.0.2) - file-tail (1.0.12) - tins (~> 0.5) - font-awesome-rails (4.0.3.1) - railties (>= 3.2, < 5.0) + execjs (2.7.0) + file-tail (1.1.1) + tins (~> 1.0) + font-awesome-rails (4.6.3.1) + railties (>= 3.2, < 5.1) foundation-rails (5.0.3.1) railties (>= 3.1.0) sass (>= 3.2.0) - haml (4.0.5) + haml (4.0.7) tilt - haml-rails (0.5.3) + haml-rails (0.9.0) actionpack (>= 4.0.1) activesupport (>= 4.0.1) - haml (>= 3.1, < 5.0) + haml (>= 4.0.6, < 5.0) + html2haml (>= 1.0.1) railties (>= 4.0.1) - haml_coffee_assets (1.16.0) - coffee-script (~> 2.0) - sprockets (~> 2.0) - tilt (~> 1.1) - high_voltage (2.1.0) + haml_coffee_assets (1.16.2) + coffee-script (>= 2) + sprockets (>= 2) + tilt (>= 1) + high_voltage (3.0.0) hike (1.2.3) - i18n (0.6.9) - jquery-rails (3.0.4) + html2haml (2.0.0) + erubis (~> 2.7.0) + haml (~> 4.0.0) + nokogiri (~> 1.6.0) + ruby_parser (~> 3.5) + i18n (0.7.0) + jquery-rails (3.1.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - marionette-rails (1.5.1) - rails (>= 3.1.0) + marionette-rails (1.8.8) + railties (>= 3.1) mime-types (1.25.1) + mini_portile2 (2.1.0) minitest (4.7.5) - multi_json (1.8.4) + multi_json (1.12.1) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) passenger (4.0.35) daemon_controller (>= 1.1.0) rack rake (>= 0.8.1) - polyglot (0.3.3) - rack (1.5.2) - rack-test (0.6.2) + pkg-config (1.1.7) + polyglot (0.3.5) + rack (1.5.5) + rack-test (0.6.3) rack (>= 1.0) rails (4.0.2) actionmailer (= 4.0.2) @@ -130,18 +134,23 @@ GEM activesupport (= 4.0.2) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.1.1) + rake (11.2.2) rdoc (4.1.1) json (~> 1.4) + ruby_parser (3.8.2) + sexp_processor (~> 4.1) sass (3.2.13) - sass-rails (4.0.1) - railties (>= 4.0.0, < 5.0) - sass (>= 3.1.10) - sprockets-rails (~> 2.0.0) + sass-rails (5.0.5) + railties (>= 4.0.0, < 6) + sass (~> 3.1) + sprockets (>= 2.8, < 4.0) + sprockets-rails (>= 2.0, < 4.0) + tilt (>= 1.1, < 3) sdoc (0.4.0) json (~> 1.8) rdoc (~> 4.0, < 5.0) - sprockets (2.10.1) + sexp_processor (4.7.0) + sprockets (2.12.4) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -150,24 +159,33 @@ GEM actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) - thor (0.18.1) - thread_safe (0.1.3) - atomic + thor (0.19.1) + thread_safe (0.3.5) tilt (1.4.1) - tins (0.13.1) + tins (1.11.0) treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.38) - uglifier (2.4.0) - execjs (>= 0.3.0) - json (>= 1.8.0) + tzinfo (0.3.51) + uglifier (3.0.0) + execjs (>= 0.3.0, < 3) PLATFORMS ruby DEPENDENCIES - debugger + backbone-on-rails (< 1) + coffee-rails (>= 4.0.0) + file-tail + font-awesome-rails + foundation-rails (> 5.0.0) + haml-rails + haml_coffee_assets + high_voltage + jquery-rails live_logs! + marionette-rails (< 2) passenger + sass-rails (>= 4.0.0) sdoc + uglifier (>= 1.3.0) diff --git a/live_logs.gemspec b/live_logs.gemspec index b8cb1bf..14a6914 100644 --- a/live_logs.gemspec +++ b/live_logs.gemspec @@ -29,8 +29,8 @@ Gem::Specification.new do |s| # Use jquery as the JavaScript library s.add_dependency 'jquery-rails' - s.add_dependency 'marionette-rails' - s.add_dependency 'backbone-on-rails' + s.add_dependency 'marionette-rails', '< 2' + s.add_dependency 'backbone-on-rails', '< 1' s.add_dependency 'high_voltage' s.add_dependency 'file-tail'