Skip to content

Commit 1301b52

Browse files
committed
Merge branch 'supported_ruby_changes'
Closes #1360, #1369 - @KaraAJC updated CI Ruby from 2.2.2 to 2.2.3 - @KaraAJC updated CI Ruby to remove Ruby 1.9.3 - @maurogeorge updated gemspec to require Ruby >= 2.0.0
2 parents f562449 + 60ac749 commit 1301b52

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.travis.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ language: ruby
33
sudo: false
44

55
rvm:
6-
- 1.9.3
76
- 2.0.0
87
- 2.1
9-
- 2.2.2
8+
- 2.2.3
109
- ruby-head
1110
- rbx-2
1211

@@ -26,8 +25,6 @@ env:
2625

2726
matrix:
2827
exclude:
29-
- rvm: 1.9.3
30-
env: RAILS_VERSION=master
3128
- rvm: 2.0.0
3229
env: RAILS_VERSION=master
3330
- rvm: 2.1

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
Breaking changes:
44

5+
- [#1360](https://github.com/rails-api/active_model_serializers/pull/1360)
6+
[#1369](https://github.com/rails-api/active_model_serializers/pull/1369) Drop support for Ruby 1.9.3 (@karaAJC, @maurogeorge)
57
- [#1131](https://github.com/rails-api/active_model_serializers/pull/1131) Remove Serializer#root_name (@beauby)
68
- [#1138](https://github.com/rails-api/active_model_serializers/pull/1138) Introduce Adapter::Base (@bf4)
79
* Adapters now inherit Adapter::Base. 'Adapter' is now a module, no longer a class.
@@ -42,6 +44,7 @@ Misc:
4244
- [#1166](https://github.com/rails-api/active_model_serializers/pull/1166) Prefer methods over instance variables (@bf4)
4345
- [#1168](https://github.com/rails-api/active_model_serializers/pull/1168) Fix appveyor failure cache not being expired (@bf4)
4446
- [#1161](https://github.com/rails-api/active_model_serializers/pull/1161) Remove duplicate test helper (@bf4)
47+
- [#1360](https://github.com/rails-api/active_model_serializers/pull/1360) Update CI to test 2.2.2 -> 2.2.3 (@karaAJC)
4548

4649
### v0.10.0.rc3 (2015/09/16 15:19 +00:00)
4750
- [#1129](https://github.com/rails-api/active_model_serializers/pull/1129) Remove SerializableResource.serialize in favor of `.new` (@bf4)

active_model_serializers.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
1818
spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
1919
spec.require_paths = ['lib']
2020

21-
spec.required_ruby_version = '>= 1.9.3'
21+
spec.required_ruby_version = '>= 2.0.0'
2222

2323
rails_versions = '>= 4.0'
2424
spec.add_runtime_dependency 'activemodel', rails_versions

0 commit comments

Comments
 (0)