From 42aa39bf7127a554e44091b1b86e549c8515b843 Mon Sep 17 00:00:00 2001 From: Bryan Helmkamp Date: Tue, 27 Oct 2009 20:19:41 -0400 Subject: Don't declare ActiveRecord gem dependency for now --- Thorfile | 5 ++++- arel.gemspec | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Thorfile b/Thorfile index edc39a16b0..982a959e82 100644 --- a/Thorfile +++ b/Thorfile @@ -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, [">= 3.0pre"]) s.add_runtime_dependency(%q, [">= 3.0pre"]) else - s.add_dependency(%q, [">= 3.0pre"]) s.add_dependency(%q, [">= 3.0pre"]) end else - s.add_dependency(%q, [">= 3.0pre"]) s.add_dependency(%q, [">= 3.0pre"]) end end -- cgit v1.2.3