Skip to content

Commit e489630

Browse files

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

Gemfile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@ else
1515
gem 'solidus_frontend', github: 'solidusio/solidus', branch: branch
1616
end
1717

18-
# Needed to help Bundler figure out how to resolve dependencies,
19-
# otherwise it takes forever to resolve them.
20-
# See https://github.com/bundler/bundler/issues/6677
21-
gem 'rails', '>0.a'
18+
rails_version = ENV.fetch('RAILS_VERSION', '~> 7.0')
19+
gem 'rails', rails_version
2220

2321
# Provides basic authentication functionality for testing parts of your engine
2422
gem 'solidus_auth_devise'
@@ -29,7 +27,11 @@ when 'mysql'
2927
when 'postgresql'
3028
gem 'pg'
3129
else
32-
gem 'sqlite3', '~> 1.4'
30+
gem 'sqlite3', rails_version < '~> 7.2' ? '~> 1.4' : '~> 2.0'
31+
end
32+
33+
if rails_version == "~> 7.0"
34+
gem 'concurrent-ruby', '< 1.3.5'
3335
end
3436

3537
# While we still support Ruby < 3 we need to workaround a limitation in

bin/sandbox

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,14 @@ group :test, :development do
6060
end
6161
RUBY
6262

63+
echo "Generating manifest file"
64+
mkdir -p app/assets/config
65+
cat <<MANIFESTJS > app/assets/config/manifest.js
66+
//= link_tree ../images
67+
//= link_directory ../javascripts .js
68+
//= link_directory ../stylesheets .css
69+
MANIFESTJS
70+
6371
unbundled bundle install --gemfile Gemfile
6472

6573
unbundled bundle exec rake db:drop db:create

solidus_act_as_tenant.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
3131

3232
spec.add_dependency 'acts_as_tenant', '~> 1.0.1'
3333
spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 5']
34-
spec.add_dependency 'solidus_support', '~> 0.5'
34+
spec.add_dependency 'solidus_support', '>= 0.12.0'
3535

3636
spec.add_development_dependency 'pry'
3737
spec.add_development_dependency 'solidus_dev_support', '~> 2.9'

0 commit comments

Comments
 (0)