From 15901acef8119a95bc99b2fb8027b6b0fbc25fd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20B=C3=B6ttger?= Date: Wed, 27 Nov 2013 23:52:25 +0100 Subject: [PATCH] playing around with Rails version builds --- .travis.yml | 20 ++++++++++++++++++++ Gemfile | 11 ++++++++--- aasm.gemspec | 6 +++--- gemfiles/rails_3.2.gemfile | 10 ++++++++++ gemfiles/rails_4.0.gemfile | 10 ++++++++++ 5 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 gemfiles/rails_3.2.gemfile create mode 100644 gemfiles/rails_4.0.gemfile diff --git a/.travis.yml b/.travis.yml index 70d6129a..b4a4d485 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: ruby + rvm: - 1.8.7 - 1.9.2 @@ -7,8 +8,27 @@ rvm: # - jruby-18mode # JRuby in 1.8 mode - jruby-19mode # JRuby in 1.9 mode - rbx-2.2.1 + services: mongodb + +gemfile: + - gemfiles/rails_3.2.gemfile + - gemfiles/rails_4.0.gemfile + matrix: allow_failures: - rvm: rbx-2.2.1 - rvm: jruby-19mode + exclude: + - rvm: 1.9.2 + gemfile: gemfiles/4.0.gemfile + - rvm: 1.9.3 + gemfile: gemfiles/4.0.gemfile + - rvm: jruby-19mode + gemfile: gemfiles/3.2.gemfile + - rvm: jruby-19mode + gemfile: gemfiles/4.0.gemfile + - rvm: rbx-2.2.1 + gemfile: gemfiles/3.2.gemfile + - rvm: rbx-2.2.1 + gemfile: gemfiles/4.0.gemfile diff --git a/Gemfile b/Gemfile index a2fff67d..7feea362 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,10 @@ -source 'https://rubygems.org' +source "https://rubygems.org" -gemspec +gem "sqlite3", :platforms => :ruby +gem "coveralls", :platforms => :ruby +gem 'rubysl', :platforms => :rbx +gem "jruby-openssl", :platforms => :jruby +gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby +gem "rails", "3.2.15" -gem 'rubysl', :platforms => :rbx +gemspec diff --git a/aasm.gemspec b/aasm.gemspec index 0d944ed3..f0e0a6b5 100644 --- a/aasm.gemspec +++ b/aasm.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |s| s.date = Time.now s.licenses = ["MIT"] - s.add_development_dependency 'activerecord', '3.2.15' + # s.add_development_dependency 'activerecord', '3.2.15' # s.add_development_dependency 'activerecord', '4.0.1' s.add_development_dependency 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3') @@ -21,13 +21,13 @@ Gem::Specification.new do |s| s.add_development_dependency 'sdoc' s.add_development_dependency 'rspec', '~> 2.14' s.add_development_dependency 'rr' - s.add_development_dependency 'sqlite3' + # s.add_development_dependency 'sqlite3' s.add_development_dependency 'minitest' # s.add_development_dependency 'debugger' # s.add_development_dependency 'pry' s.add_development_dependency 'mime-types', '~> 1.25' # needed by coveralls (>= 2.0 needs Ruby >=1.9.2) - s.add_development_dependency 'coveralls' + # s.add_development_dependency 'coveralls' s.files = `git ls-files`.split("\n") s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n") diff --git a/gemfiles/rails_3.2.gemfile b/gemfiles/rails_3.2.gemfile new file mode 100644 index 00000000..d959568f --- /dev/null +++ b/gemfiles/rails_3.2.gemfile @@ -0,0 +1,10 @@ +source "https://rubygems.org" + +gem "sqlite3", :platforms => :ruby +gem "coveralls", :platforms => :ruby +gem 'rubysl', :platforms => :rbx +gem "jruby-openssl", :platforms => :jruby +gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby +gem "rails", "3.2.15" + +gemspec :path => "../" diff --git a/gemfiles/rails_4.0.gemfile b/gemfiles/rails_4.0.gemfile new file mode 100644 index 00000000..f01befbf --- /dev/null +++ b/gemfiles/rails_4.0.gemfile @@ -0,0 +1,10 @@ +source "https://rubygems.org" + +gem "sqlite3", :platforms => :ruby +gem "coveralls", :platforms => :ruby +gem 'rubysl', :platforms => :rbx +gem "jruby-openssl", :platforms => :jruby +gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby +gem "rails", "4.0.1" + +gemspec :path => "../"