Skip to content

Commit ec23d29

Browse files
committed
Merge pull request #62 from rsim/bump-up-dependency-advanced-adapter-to-1.5-activerecord-4.1
Declare compatibility with advanced adapter to 1.5.x and activerecord to 4.1.x
2 parents 432456d + 9d8d748 commit ec23d29

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ group :development do
55
gem 'rspec', '~> 3.1'
66

77
unless ENV['NO_ACTIVERECORD']
8-
gem 'activerecord', '~> 3.2.3'
9-
gem 'activerecord-oracle_enhanced-adapter', '~> 1.4.1'
8+
gem 'activerecord', '>= 3.2.3', '< 4.2.0'
9+
gem 'activerecord-oracle_enhanced-adapter', '>= 1.4.1', '< 1.6.0'
1010
end
1111

1212
platforms :ruby do

ruby-plsql.gemspec

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,21 +66,21 @@ Gem::Specification.new do |s|
6666
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
6767
s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
6868
s.add_development_dependency(%q<rspec>, ["~> 3.1"])
69-
s.add_development_dependency(%q<activerecord>, ["~> 3.2.3"])
70-
s.add_development_dependency(%q<activerecord-oracle_enhanced-adapter>, ["~> 1.4.1"])
69+
s.add_development_dependency(%q<activerecord>, [">= 3.2.3", "< 4.2.0"])
70+
s.add_development_dependency(%q<activerecord-oracle_enhanced-adapter>, [">= 1.4.1", "< 1.6.0"])
7171
s.add_development_dependency(%q<ruby-oci8>, [">= 0"])
7272
else
7373
s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
7474
s.add_dependency(%q<rspec>, ["~> 3.1"])
75-
s.add_dependency(%q<activerecord>, ["~> 3.2.3"])
76-
s.add_dependency(%q<activerecord-oracle_enhanced-adapter>, ["~> 1.4.1"])
75+
s.add_dependency(%q<activerecord>, [">= 3.2.3", "< 4.2.0"])
76+
s.add_dependency(%q<activerecord-oracle_enhanced-adapter>, [">= 1.4.1", "< 1.6.0"])
7777
s.add_dependency(%q<ruby-oci8>, [">= 0"])
7878
end
7979
else
8080
s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
8181
s.add_dependency(%q<rspec>, ["~> 3.1"])
82-
s.add_dependency(%q<activerecord>, ["~> 3.2.3"])
83-
s.add_dependency(%q<activerecord-oracle_enhanced-adapter>, ["~> 1.4.1"])
82+
s.add_dependency(%q<activerecord>, [">= 3.2.3", "< 4.2.0"])
83+
s.add_dependency(%q<activerecord-oracle_enhanced-adapter>, [">= 1.4.1", "< 1.6.0"])
8484
s.add_dependency(%q<ruby-oci8>, [">= 0"])
8585
end
8686
end

0 commit comments

Comments
 (0)