Permalink
Browse files

Don't declare ActiveRecord gem dependency for now

  • Loading branch information...
1 parent 492f96e commit 42aa39bf7127a554e44091b1b86e549c8515b843 @brynary brynary committed Oct 28, 2009
Showing with 4 additions and 4 deletions.
  1. +4 −1 Thorfile
  2. +0 −3 arel.gemspec
View
@@ -29,7 +29,10 @@ and query generation.
s.has_rdoc = true
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"
end
end
View
@@ -227,14 +227,11 @@ and query generation.}
s.specification_version = 3
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"])
else
- s.add_dependency(%q<activerecord>, [">= 3.0pre"])
s.add_dependency(%q<activesupport>, [">= 3.0pre"])
end
else
- s.add_dependency(%q<activerecord>, [">= 3.0pre"])
s.add_dependency(%q<activesupport>, [">= 3.0pre"])
end
end

0 comments on commit 42aa39b

Please sign in to comment.