Gemfile in active_model_serializers-0.10.6 vs Gemfile in active_model_serializers-0.10.7

- old
+ new

@@ -10,10 +10,11 @@ version = ENV['RAILS_VERSION'] || '4.2' if version == 'master' gem 'rack', github: 'rack/rack' gem 'arel', github: 'rails/arel' + gem 'rails', github: 'rails/rails' git 'https://github.com/rails/rails.git' do gem 'railties' gem 'activesupport' gem 'activemodel' gem 'actionpack' @@ -21,10 +22,11 @@ # Rails 5 gem 'actionview' end else gem_version = "~> #{version}.0" + gem 'rails', gem_version gem 'railties', gem_version gem 'activesupport', gem_version gem 'activemodel', gem_version gem 'actionpack', gem_version gem 'activerecord', gem_version, group: :test @@ -34,21 +36,35 @@ @windows_platforms = [:mswin, :mingw, :x64_mingw] # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: (@windows_platforms + [:jruby]) +if ENV['CI'] + if RUBY_VERSION < '2.4' + # Windows: An error occurred while installing nokogiri (1.8.0) + gem 'nokogiri', '< 1.7', platforms: @windows_platforms + end +end + group :bench do # https://github.com/rails-api/active_model_serializers/commit/cb4459580a6f4f37f629bf3185a5224c8624ca76 gem 'benchmark-ips', '>= 2.7.2', require: false, group: :development end group :test do - gem 'sqlite3', platform: (@windows_platforms + [:ruby]) - gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby + gem 'sqlite3', platform: (@windows_platforms + [:ruby]) + platforms :jruby do + if version == 'master' || version >= '5' + gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0' # github: 'jruby/activerecord-jdbc-adapter', branch: 'master' + else + gem 'activerecord-jdbcsqlite3-adapter' + end + end gem 'codeclimate-test-reporter', require: false gem 'm', '~> 1.5' - gem 'pry', '~> 0.10' - gem 'pry-byebug', '~> 3.4', platform: :ruby + gem 'pry', '>= 0.10' + gem 'byebug', '~> 8.2' if RUBY_VERSION < '2.2' + gem 'pry-byebug', platform: :ruby end group :development, :test do gem 'rubocop', '~> 0.40.0', require: false gem 'yard', require: false