diff options
| -rw-r--r-- | Thorfile | 5 | ||||
| -rw-r--r-- | arel.gemspec | 3 |
2 files changed, 4 insertions, 4 deletions
@@ -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 diff --git a/arel.gemspec b/arel.gemspec index a7dbeca51d..9bd483938d 100644 --- a/arel.gemspec +++ b/arel.gemspec @@ -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 |