Skip to content

Commit

Permalink
Don't declare ActiveRecord gem dependency for now
Browse files Browse the repository at this point in the history
  • Loading branch information
brynary committed Oct 28, 2009
1 parent 492f96e commit 42aa39b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
5 changes: 4 additions & 1 deletion Thorfile
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ and query generation.
s.has_rdoc = true s.has_rdoc = true
s.extra_rdoc_files = %w[README.markdown] s.extra_rdoc_files = %w[README.markdown]


s.add_dependency "activerecord", ">= 3.0pre" # Arel required ActiveRecord, but we're not declaring it to avoid a
# circular dependency chain. The solution is for ActiveRecord to release
# the connection adapters which Arel uses in a separate gem
# s.add_dependency "activerecord", ">= 3.0pre"
s.add_dependency "activesupport", ">= 3.0pre" s.add_dependency "activesupport", ">= 3.0pre"
end end
end end
Expand Down
3 changes: 0 additions & 3 deletions arel.gemspec
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -227,14 +227,11 @@ and query generation.}
s.specification_version = 3 s.specification_version = 3


if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<activerecord>, [">= 3.0pre"])
s.add_runtime_dependency(%q<activesupport>, [">= 3.0pre"]) s.add_runtime_dependency(%q<activesupport>, [">= 3.0pre"])
else else
s.add_dependency(%q<activerecord>, [">= 3.0pre"])
s.add_dependency(%q<activesupport>, [">= 3.0pre"]) s.add_dependency(%q<activesupport>, [">= 3.0pre"])
end end
else else
s.add_dependency(%q<activerecord>, [">= 3.0pre"])
s.add_dependency(%q<activesupport>, [">= 3.0pre"]) s.add_dependency(%q<activesupport>, [">= 3.0pre"])
end end
end end

0 comments on commit 42aa39b

Please sign in to comment.