Skip to content

Commit

Permalink
fix problems with gemspec dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
cqr committed Jan 4, 2011
1 parent 51c4714 commit cc5c412
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 41 deletions.
8 changes: 4 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ group :development do
gem 'autotest'
gem 'sqlite3-ruby'
gem "rspec", ">= 2.0.0"
gem "bundler", ">= 1.0.0.rc.5"
gem "jeweler", "~> 1.5.0.pre2"
gem "bundler", "~> 1.0.0"
gem "jeweler", "~> 1.5.0"
gem "rcov", ">= 0"
gem "actionpack", '~> 2.3.8'
gem 'activerecord', "~> 2.3.8", :require => 'active_record'
gem "actionpack", '~> 2.3.0'
gem 'activerecord', "~> 2.3.0", :require => 'active_record'
end
44 changes: 22 additions & 22 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
GEM
remote: http://rubygems.org/
specs:
actionpack (2.3.9)
activesupport (= 2.3.9)
ZenTest (4.4.2)
actionpack (2.3.10)
activesupport (= 2.3.10)
rack (~> 1.1.0)
activerecord (2.3.9)
activesupport (= 2.3.9)
activesupport (2.3.9)
autotest (4.3.2)
activerecord (2.3.10)
activesupport (= 2.3.10)
activesupport (2.3.10)
autotest (4.4.6)
ZenTest (>= 4.4.1)
configatron (2.6.4)
yamler (>= 0.1.0)
diff-lcs (1.1.2)
git (1.2.5)
jeweler (1.5.0.pre3)
jeweler (1.5.2)
bundler (~> 1.0.0)
git (>= 1.2.5)
rake
rack (1.1.0)
rake (0.8.7)
rcov (0.9.9)
rspec (2.0.1)
rspec-core (~> 2.0.1)
rspec-expectations (~> 2.0.1)
rspec-mocks (~> 2.0.1)
rspec-core (2.0.1)
rspec-expectations (2.0.1)
diff-lcs (>= 1.1.2)
rspec-mocks (2.0.1)
rspec-core (~> 2.0.1)
rspec-expectations (~> 2.0.1)
sqlite3-ruby (1.3.1)
rspec (2.4.0)
rspec-core (~> 2.4.0)
rspec-expectations (~> 2.4.0)
rspec-mocks (~> 2.4.0)
rspec-core (2.4.0)
rspec-expectations (2.4.0)
diff-lcs (~> 1.1.2)
rspec-mocks (2.4.0)
sqlite3-ruby (1.3.2)
yamler (0.1.0)

PLATFORMS
ruby

DEPENDENCIES
actionpack (~> 2.3.8)
activerecord (~> 2.3.8)
actionpack (~> 2.3.0)
activerecord (~> 2.3.0)
autotest
bundler (>= 1.0.0.rc.5)
bundler (~> 1.0.0)
configatron
jeweler (~> 1.5.0.pre2)
jeweler (~> 1.5.0)
rcov
rspec (>= 2.0.0)
sqlite3-ruby
29 changes: 14 additions & 15 deletions apn_on_rails.gemspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by jeweler
# DO NOT EDIT THIS FILE DIRECTLY
# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
# -*- encoding: utf-8 -*-

Gem::Specification.new do |s|
Expand All @@ -9,7 +9,7 @@ Gem::Specification.new do |s|

s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["markbates", "Rebecca Nesson"]
s.date = %q{2010-11-09}
s.date = %q{2011-01-04}
s.description = %q{APN on Rails is a Ruby on Rails gem that allows you to
easily add Apple Push Notification (iPhone) support to your Rails application.
}
Expand All @@ -20,7 +20,6 @@ easily add Apple Push Notification (iPhone) support to your Rails application.
"README.textile"
]
s.files = [
".gitignore",
".rspec",
".specification",
"Gemfile",
Expand Down Expand Up @@ -113,32 +112,32 @@ easily add Apple Push Notification (iPhone) support to your Rails application.
s.add_development_dependency(%q<autotest>, [">= 0"])
s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
s.add_development_dependency(%q<bundler>, [">= 1.0.0.rc.5"])
s.add_development_dependency(%q<jeweler>, ["~> 1.5.0.pre2"])
s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
s.add_development_dependency(%q<jeweler>, ["~> 1.5.0"])
s.add_development_dependency(%q<rcov>, [">= 0"])
s.add_development_dependency(%q<actionpack>, ["~> 2.3.8"])
s.add_development_dependency(%q<activerecord>, ["~> 2.3.8"])
s.add_development_dependency(%q<actionpack>, ["~> 2.3.0"])
s.add_development_dependency(%q<activerecord>, ["~> 2.3.0"])
else
s.add_dependency(%q<configatron>, [">= 0"])
s.add_dependency(%q<autotest>, [">= 0"])
s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
s.add_dependency(%q<rspec>, [">= 2.0.0"])
s.add_dependency(%q<bundler>, [">= 1.0.0.rc.5"])
s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre2"])
s.add_dependency(%q<bundler>, ["~> 1.0.0"])
s.add_dependency(%q<jeweler>, ["~> 1.5.0"])
s.add_dependency(%q<rcov>, [">= 0"])
s.add_dependency(%q<actionpack>, ["~> 2.3.8"])
s.add_dependency(%q<activerecord>, ["~> 2.3.8"])
s.add_dependency(%q<actionpack>, ["~> 2.3.0"])
s.add_dependency(%q<activerecord>, ["~> 2.3.0"])
end
else
s.add_dependency(%q<configatron>, [">= 0"])
s.add_dependency(%q<autotest>, [">= 0"])
s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
s.add_dependency(%q<rspec>, [">= 2.0.0"])
s.add_dependency(%q<bundler>, [">= 1.0.0.rc.5"])
s.add_dependency(%q<jeweler>, ["~> 1.5.0.pre2"])
s.add_dependency(%q<bundler>, ["~> 1.0.0"])
s.add_dependency(%q<jeweler>, ["~> 1.5.0"])
s.add_dependency(%q<rcov>, [">= 0"])
s.add_dependency(%q<actionpack>, ["~> 2.3.8"])
s.add_dependency(%q<activerecord>, ["~> 2.3.8"])
s.add_dependency(%q<actionpack>, ["~> 2.3.0"])
s.add_dependency(%q<activerecord>, ["~> 2.3.0"])
end
end

0 comments on commit cc5c412

Please sign in to comment.