From 338868a45096b67aff774f87b416323fa8852fa0 Mon Sep 17 00:00:00 2001 From: Kara Carrell Date: Tue, 1 Dec 2015 17:43:14 -0600 Subject: [PATCH 1/4] Update travis build matrix to include Ruby 2.2.3 for Rails 5 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bfc8edfd..9b3a55cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ rvm: - 1.9.3 - 2.0.0 - 2.1 - - 2.2.2 + - 2.2.3 - ruby-head - rbx-2 From 850ac3feaf39535a9ec18d6fbdb7372ccc8ffd07 Mon Sep 17 00:00:00 2001 From: Kara Carrell Date: Thu, 10 Dec 2015 18:11:06 -0600 Subject: [PATCH 2/4] drop support to Ruby 1.9.3 from build matrix --- .travis.yml | 3 --- CHANGELOG.md | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9b3a55cc..5862e1bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ language: ruby sudo: false rvm: - - 1.9.3 - 2.0.0 - 2.1 - 2.2.3 @@ -26,8 +25,6 @@ env: matrix: exclude: - - rvm: 1.9.3 - env: RAILS_VERSION=master - rvm: 2.0.0 env: RAILS_VERSION=master - rvm: 2.1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c8f5547..ff1ea4af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ Features: CollectionSerializer for clarity, add ActiveModelSerializers.config.collection_serializer (@bf4) Fixes: +- [#1360](https://github.com/rails-api/active_model_serializers/pull/1360) Update Travis CI build matrix with ruby 2.2.3 supporting rails5 (@karaAJC) - [#1239](https://github.com/rails-api/active_model_serializers/pull/1239) Fix duplicates in JSON API compound documents (@beauby) - [#1214](https://github.com/rails-api/active_model_serializers/pull/1214) retrieve the key from the reflection options when building associations (@NullVoxPopuli, @hut8) - [#1358](https://github.com/rails-api/active_model_serializers/pull/1358) Handle serializer file paths with spaces (@rwstauner, @bf4) From 488370fc0b07b1a057bae1702efb8429e83f80e2 Mon Sep 17 00:00:00 2001 From: Mauro George Date: Thu, 10 Dec 2015 20:02:41 -0200 Subject: [PATCH 3/4] Drop support to Ruby 1.9.3 --- CHANGELOG.md | 1 + active_model_serializers.gemspec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff1ea4af..0ecafdce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ Breaking changes: +- Drop support to Ruby 1.9.3 (@maurogeorge) - [#1131](https://github.com/rails-api/active_model_serializers/pull/1131) Remove Serializer#root_name (@beauby) - [#1138](https://github.com/rails-api/active_model_serializers/pull/1138) Introduce Adapter::Base (@bf4) * Adapters now inherit Adapter::Base. 'Adapter' is now a module, no longer a class. diff --git a/active_model_serializers.gemspec b/active_model_serializers.gemspec index 3ccd9654..ecab62e6 100644 --- a/active_model_serializers.gemspec +++ b/active_model_serializers.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ['lib'] - spec.required_ruby_version = '>= 1.9.3' + spec.required_ruby_version = '>= 2.0.0' rails_versions = '>= 4.0' spec.add_runtime_dependency 'activemodel', rails_versions From 60ac749edfc30f1e31d95622526bd9d2a07c6003 Mon Sep 17 00:00:00 2001 From: Benjamin Fleischer Date: Mon, 14 Dec 2015 14:21:55 -0600 Subject: [PATCH 4/4] Cleanup CHANGELOG --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ecafdce..a8c731fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,8 @@ Breaking changes: -- Drop support to Ruby 1.9.3 (@maurogeorge) +- [#1360](https://github.com/rails-api/active_model_serializers/pull/1360) + [#1369](https://github.com/rails-api/active_model_serializers/pull/1369) Drop support for Ruby 1.9.3 (@karaAJC, @maurogeorge) - [#1131](https://github.com/rails-api/active_model_serializers/pull/1131) Remove Serializer#root_name (@beauby) - [#1138](https://github.com/rails-api/active_model_serializers/pull/1138) Introduce Adapter::Base (@bf4) * Adapters now inherit Adapter::Base. 'Adapter' is now a module, no longer a class. @@ -26,7 +27,6 @@ Features: CollectionSerializer for clarity, add ActiveModelSerializers.config.collection_serializer (@bf4) Fixes: -- [#1360](https://github.com/rails-api/active_model_serializers/pull/1360) Update Travis CI build matrix with ruby 2.2.3 supporting rails5 (@karaAJC) - [#1239](https://github.com/rails-api/active_model_serializers/pull/1239) Fix duplicates in JSON API compound documents (@beauby) - [#1214](https://github.com/rails-api/active_model_serializers/pull/1214) retrieve the key from the reflection options when building associations (@NullVoxPopuli, @hut8) - [#1358](https://github.com/rails-api/active_model_serializers/pull/1358) Handle serializer file paths with spaces (@rwstauner, @bf4) @@ -44,6 +44,7 @@ Misc: - [#1166](https://github.com/rails-api/active_model_serializers/pull/1166) Prefer methods over instance variables (@bf4) - [#1168](https://github.com/rails-api/active_model_serializers/pull/1168) Fix appveyor failure cache not being expired (@bf4) - [#1161](https://github.com/rails-api/active_model_serializers/pull/1161) Remove duplicate test helper (@bf4) +- [#1360](https://github.com/rails-api/active_model_serializers/pull/1360) Update CI to test 2.2.2 -> 2.2.3 (@karaAJC) ### v0.10.0.rc3 (2015/09/16 15:19 +00:00) - [#1129](https://github.com/rails-api/active_model_serializers/pull/1129) Remove SerializableResource.serialize in favor of `.new` (@bf4)