Skip to content

Commit

Permalink
Allow and Test in Rails 8, super hackily
Browse files Browse the repository at this point in the history
  • Loading branch information
jrochkind committed Nov 26, 2024
1 parent 5f2632a commit e75f900
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 3 deletions.
17 changes: 16 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ end

# Set a default RAILS_VERSION so we make sure to get extra dependencies for it...

ENV['RAILS_VERSION'] ||= "7.1.1"
ENV['RAILS_VERSION'] ||= "8.0.0"

if ENV['RAILS_VERSION']
if ENV['RAILS_VERSION'] == 'edge'
Expand All @@ -36,17 +36,32 @@ if ENV['RAILS_VERSION']
when /^7\.1\./
# sprockets is optional for rails 7, but we currently require it, and test with it.
gem "sprockets-rails"
when /^8./
# sprockets is not usually included in Rails 8, but we currently require it, and test with it.
gem "sprockets-rails"
when /^7\.0\./
# rails previous to 7.1 can't use sqlite 2
gem "sqlite3", "~> 1.4"

# sprockets is optional for rails 7, but we currently require it, and test with it.
gem "sprockets-rails"
when /^6\.1\./
# rails previous to 7.1 can't use sqlite 2
gem "sqlite3", "~> 1.4"

# opt into mail 2.8.0.rc1 so we get extra dependencies required for rails 6.1
# Once mail 2.8.0 final is released this will not be required.
# https://github.com/mikel/mail/pull/1472
gem "mail", ">= 2.8.0.rc1"
when /^6\.0\./
# rails previous to 7.1 can't use sqlite 2
gem "sqlite3", "~> 1.4"

gem 'sass-rails', '>= 6'
when /^5\.[12]\./
# rails previous to 7.1 can't use sqlite 2
gem "sqlite3", "~> 1.4"

gem 'sass-rails', '~> 5.0'
gem 'sprockets', '~> 3.7'
gem 'thor', '~> 0.20'
Expand Down
4 changes: 2 additions & 2 deletions browse-everything.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
spec.add_dependency 'dropbox_api', '>= 0.1.20'
spec.add_dependency 'google-apis-drive_v3'
spec.add_dependency 'googleauth', '>= 0.6.6', '< 2.0'
spec.add_dependency 'rails', '>= 4.2', '< 8.0'
spec.add_dependency 'rails', '>= 4.2', '< 8.1'
spec.add_dependency 'ruby-box'
spec.add_dependency 'signet', '~> 0.8'
spec.add_dependency 'typhoeus'
Expand All @@ -49,7 +49,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'sass-rails'
spec.add_development_dependency 'selenium-webdriver'
# Rails <= 7.1 can't use sqlite3 gem 2.x yet
spec.add_development_dependency 'sqlite3', "~> 1.4"
spec.add_development_dependency 'sqlite3'
spec.add_development_dependency 'turbolinks'
spec.add_development_dependency 'webdrivers'
spec.add_development_dependency 'webmock'
Expand Down

0 comments on commit e75f900

Please sign in to comment.