Skip to content

Commit

Permalink
Unpin ActiveSupport (#2324)
Browse files Browse the repository at this point in the history
* Unpin ActiveSupport

Unpins ActiveSupport for compatibility with Rails 6.

* Use range for ActiveSupport gem

Allows range of ActiveSupport between 5 and 6.
  • Loading branch information
brettmortensen committed May 19, 2020
1 parent 1bea29f commit 4cf8478
Show file tree
Hide file tree
Showing 2 changed files with 79 additions and 81 deletions.
158 changes: 78 additions & 80 deletions Gemfile.lock
Expand Up @@ -8,7 +8,7 @@ PATH
remote: middleman-core
specs:
middleman-core (5.0.0.rc.1)
activesupport (~> 5.2)
activesupport (>= 5.0.0)
addressable (~> 2.3)
bundler
contracts (~> 0.16.0)
Expand All @@ -34,26 +34,27 @@ PATH
GEM
remote: https://rubygems.org/
specs:
activesupport (5.2.3)
activesupport (6.0.3.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
aruba (0.14.9)
childprocess (>= 0.6.3, < 1.1.0)
zeitwerk (~> 2.2, >= 2.2.2)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
aruba (0.14.14)
childprocess (>= 0.6.3, < 4.0.0)
contracts (~> 0.9)
cucumber (>= 1.3.19)
ffi (~> 1.9)
rspec-expectations (>= 2.99)
thor (~> 0.19)
thor (>= 0.19, < 2.0)
ast (2.4.0)
backports (3.15.0)
backports (3.17.1)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
builder (3.2.3)
byebug (11.0.1)
builder (3.2.4)
byebug (11.1.3)
capybara (2.5.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
Expand All @@ -65,14 +66,13 @@ GEM
celluloid-io (0.16.2)
celluloid (>= 0.16.0)
nio4r (>= 1.1.0)
childprocess (1.0.1)
rake (< 13.0)
childprocess (3.0.0)
coderay (1.1.2)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.5)
concurrent-ruby (1.1.6)
contracts (0.16.0)
cucumber (3.1.2)
builder (>= 2.1.2)
Expand All @@ -92,94 +92,93 @@ GEM
cucumber-wire (0.0.1)
debug_inspector (0.0.3)
diff-lcs (1.3)
docile (1.3.1)
dotenv (2.7.2)
docile (1.3.2)
dotenv (2.7.5)
erubis (2.7.0)
execjs (2.7.0)
fastimage (2.1.5)
ffi (1.11.1)
fastimage (2.1.7)
ffi (1.12.2)
gherkin (5.1.0)
haml (5.1.1)
haml (5.1.2)
temple (>= 0.8.0)
tilt
hamster (3.0.0)
concurrent-ruby (~> 1.0)
hashie (3.6.0)
hitimes (1.3.1)
hitimes (2.0.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
interception (0.5)
jaro_winkler (1.5.2)
json (2.2.0)
jaro_winkler (1.5.4)
kramdown (1.17.0)
lazy_priority_queue (0.1.1)
libv8 (7.3.492.27.1)
liquid (4.0.3)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
memoist (0.16.0)
method_source (0.9.2)
mime-types (3.2.2)
listen (3.2.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
memoist (0.16.2)
method_source (1.0.0)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.0331)
mime-types-data (3.2020.0512)
mini_portile2 (2.4.0)
mini_racer (0.2.6)
libv8 (>= 6.9.411)
minitest (5.11.3)
multi_json (1.13.1)
mini_racer (0.2.14)
libv8 (> 7.3)
minitest (5.14.1)
multi_json (1.14.1)
multi_test (0.1.2)
mustermann (1.0.3)
nio4r (2.3.1)
nokogiri (1.10.3)
mustermann (1.1.1)
ruby2_keywords (~> 0.0.1)
nio4r (2.5.2)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
oj (3.7.12)
oj (3.10.6)
padrino-helpers (0.14.4)
i18n (~> 0.6, >= 0.6.7)
padrino-support (= 0.14.4)
tilt (>= 1.4.1, < 3)
padrino-support (0.14.4)
parallel (1.17.0)
parser (2.6.3.0)
parallel (1.19.1)
parser (2.7.1.2)
ast (~> 2.4.0)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry (0.13.1)
coderay (~> 1.1)
method_source (~> 1.0)
pry-rescue (1.5.0)
interception (>= 0.5)
pry (>= 0.12.0)
pry-stack_explorer (0.4.9.3)
binding_of_caller (>= 0.7)
pry (>= 0.9.11)
public_suffix (3.0.3)
rack (2.0.7)
rack-protection (2.0.5)
public_suffix (4.0.5)
rack (2.2.2)
rack-protection (2.0.8.1)
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rainbow (3.0.0)
rake (12.3.2)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
rake (12.3.3)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
redcarpet (3.4.0)
rgl (0.5.4)
redcarpet (3.5.0)
rgl (0.5.6)
lazy_priority_queue (~> 0.1.0)
stream (~> 0.5.2)
rspec (3.8.0)
rspec-core (~> 3.8.0)
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-core (3.8.0)
rspec-support (~> 3.8.0)
rspec-expectations (3.8.3)
rspec (3.9.0)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.9.0)
rspec-core (3.9.2)
rspec-support (~> 3.9.3)
rspec-expectations (3.9.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-mocks (3.8.0)
rspec-support (~> 3.9.0)
rspec-mocks (3.9.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-support (3.8.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.3)
rubocop (0.70.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
Expand All @@ -189,48 +188,47 @@ GEM
unicode-display_width (>= 1.4.0, < 1.7)
rubocop-performance (1.3.0)
rubocop (>= 0.68.0)
ruby-progressbar (1.10.0)
ruby_dep (1.5.0)
ruby-progressbar (1.10.1)
ruby2_keywords (0.0.2)
rubydns (1.0.3)
celluloid (= 0.16.0)
celluloid-io (= 0.16.2)
timers (~> 4.0.1)
sassc (2.0.1)
sassc (2.3.0)
ffi (~> 1.9)
rake
servolux (0.13.0)
simplecov (0.16.1)
simplecov (0.18.5)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
sinatra (2.0.5)
simplecov-html (~> 0.11)
simplecov-html (0.12.2)
sinatra (2.0.8.1)
mustermann (~> 1.0)
rack (~> 2.0)
rack-protection (= 2.0.5)
rack-protection (= 2.0.8.1)
tilt (~> 2.0)
slim (4.0.1)
slim (4.1.0)
temple (>= 0.7.6, < 0.9)
tilt (>= 2.0.6, < 2.1)
stream (0.5.2)
stylus (1.0.2)
execjs
stylus-source
stylus-source (0.54.5)
temple (0.8.1)
thor (0.20.3)
temple (0.8.2)
thor (1.0.1)
thread_safe (0.3.6)
tilt (2.0.9)
tilt (2.0.10)
timers (4.0.4)
hitimes
tzinfo (1.2.5)
tzinfo (1.2.7)
thread_safe (~> 0.1)
uglifier (4.1.20)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
unicode-display_width (1.6.0)
unicode-display_width (1.6.1)
xpath (2.1.0)
nokogiri (~> 1.3)
yard (0.9.19)
yard (0.9.25)
zeitwerk (2.3.0)

PLATFORMS
ruby
Expand Down Expand Up @@ -266,4 +264,4 @@ DEPENDENCIES
yard (~> 0.9.11)

BUNDLED WITH
2.0.1
2.1.4
2 changes: 1 addition & 1 deletion middleman-core/middleman-core.gemspec
Expand Up @@ -28,7 +28,7 @@ Gem::Specification.new do |s|
s.add_dependency('rgl', ['~> 0.5.3'])

# Helpers
s.add_dependency('activesupport', ['~> 5.2'])
s.add_dependency('activesupport', ['>= 5.0.0'])
s.add_dependency('padrino-helpers', ['~> 0.14.4'])
s.add_dependency('addressable', ['~> 2.3'])
s.add_dependency('memoist', ['~> 0.14'])
Expand Down

0 comments on commit 4cf8478

Please sign in to comment.