Skip to content

Commit 8278246

Browse files
committed
1 parent bc1ce70 commit 8278246

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

Gemfile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
source 'https://rubygems.org'
44
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
55

6-
branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
7-
gem 'solidus', github: 'solidusio/solidus', branch: branch
6+
solidus_branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
7+
gem 'solidus', github: 'solidusio/solidus', branch: solidus_branch
88

99
# The solidus_frontend gem has been pulled out since v3.2
10-
if branch >= 'v3.2'
10+
if solidus_branch >= 'v3.2'
1111
gem 'solidus_frontend'
12-
elsif branch == 'main'
12+
elsif solidus_branch == 'main'
1313
gem 'solidus_frontend', github: 'solidusio/solidus_frontend'
1414
else
15-
gem 'solidus_frontend', github: 'solidusio/solidus', branch: branch
15+
gem 'solidus_frontend', github: 'solidusio/solidus', branch: solidus_branch
1616
end
1717

1818
# Needed to help Bundler figure out how to resolve dependencies,
@@ -35,6 +35,10 @@ end
3535
# Temporarily link solidus_support with Flickwerk support
3636
gem "solidus_support", github: "mamhoff/solidus_support", branch: "re-enable-flickwerk"
3737

38+
if ["v4.1", "v4.2"].include?(solidus_branch)
39+
gem "concurrent-ruby", "< 1.3.5"
40+
end
41+
3842
gemspec
3943

4044
# Use a local Gemfile to include development dependencies that might not be

0 commit comments

Comments
 (0)