aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Helmkamp <bryan@brynary.com>2009-10-27 20:19:41 -0400
committerBryan Helmkamp <bryan@brynary.com>2009-10-27 20:19:41 -0400
commit42aa39bf7127a554e44091b1b86e549c8515b843 (patch)
tree6e1184f83aafa11a8f828d8b79e2862b4940972e
parent492f96e83947b38e21bdde22caedb992cb1e4083 (diff)
downloadrails-42aa39bf7127a554e44091b1b86e549c8515b843.tar.gz
rails-42aa39bf7127a554e44091b1b86e549c8515b843.tar.bz2
rails-42aa39bf7127a554e44091b1b86e549c8515b843.zip
Don't declare ActiveRecord gem dependency for now
-rw-r--r--Thorfile5
-rw-r--r--arel.gemspec3
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<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