Skip to content

Commit

Permalink
Merge d867f63 into 51a45e4
Browse files Browse the repository at this point in the history
  • Loading branch information
andrykonchin committed Jun 17, 2018
2 parents 51a45e4 + d867f63 commit 7d6f369
Show file tree
Hide file tree
Showing 8 changed files with 76 additions and 116 deletions.
32 changes: 5 additions & 27 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,16 @@ sudo: required

language: ruby
rvm:
- ruby-2.0.0-p648
- ruby-2.1.10
- ruby-2.2.7
- ruby-2.3.4
- ruby-2.4.1
- jruby-9.1.9.0
- ruby-2.3.7
- ruby-2.4.4
- ruby-2.5.1
- jruby-9.1.17.0
gemfile:
gemfile:
- gemfiles/rails_4_0.gemfile
- gemfiles/rails_4_1.gemfile
- gemfiles/rails_4_2.gemfile
- gemfiles/rails_5_0.gemfile
- gemfiles/rails_5_1.gemfile
- gemfiles/rails_5_2.gemfile
matrix:
exclude:
- rvm: ruby-2.0.0-p648
gemfile: gemfiles/rails_5_0.gemfile
- rvm: ruby-2.0.0-p648
gemfile: gemfiles/rails_5_1.gemfile
- rvm: ruby-2.0.0-p648
gemfile: gemfiles/rails_5_2.gemfile
- rvm: ruby-2.1.10
gemfile: gemfiles/rails_5_0.gemfile
- rvm: ruby-2.1.10
gemfile: gemfiles/rails_5_1.gemfile
- rvm: ruby-2.1.10
gemfile: gemfiles/rails_5_2.gemfile
- rvm: ruby-2.4.1
gemfile: gemfiles/rails_4_0.gemfile
- rvm: ruby-2.4.1
gemfile: gemfiles/rails_4_1.gemfile

### BUILD LIFECYCLE STEPS ###

Expand All @@ -47,7 +25,7 @@ before_install:
- docker ps

after_install:
- gem install bundler -v 1.15.4
- gem install bundler -v 1.16.2
- bundle install

before_script:
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

## Breaking

* Improvement: [#267](https://github.com/Dynamoid/Dynamoid/pull/267) Upgrade AWS SDK to V3 (@andrykonchin)
* Maintenace: [#267](https://github.com/Dynamoid/Dynamoid/pull/267) Upgrade AWS SDK to V3 (@andrykonchin)
* Maintenace: [#268](https://github.com/Dynamoid/Dynamoid/pull/268) Drop support of old Ruby and Rails versions (@andrykonchin)

## Improvements

Expand Down
21 changes: 10 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,21 +92,20 @@ Then you need to initialize Dynamoid config to get it going. Put code similar to
config.namespace = "dynamoid_app_development" # To namespace tables created by Dynamoid from other tables you might have. Set to nil to avoid namespacing.
config.endpoint = 'http://localhost:3000' # [Optional]. If provided, it communicates with the DB listening at the endpoint. This is useful for testing with [Amazon Local DB] (http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Tools.DynamoDBLocal.html).
end

```

### Ruby & Rails Compatibility Matrix
### Ruby & Rails Compatibility

Dynamoid supports Ruby >= 2.3 and Rails >= 4.2.

Its compatibility is tested in following way:

| Ruby / Active Record | 4.0.x | 4.1.x | 4.2.x | 5.0.x |
| Ruby / Active Record | 4.2.x | 5.0.x | 5.1.x | 5.2.x |
|:---------------------:|:-----:|:-----:|:-----:|:-----:|
| 2.0.0 |||| |
| 2.1.x |||| |
| 2.2.0-2.2.1 |||| |
| 2.2.2+ |||||
| 2.3.x |||||
| 2.3.x |||||
| 2.4.x | | |||
| jruby-9.X |||||
| 2.3.7 |||||
| 2.4.4 |||||
| 2.5.1 |||||
| jruby-9.1.17.0 |||||

## Setup

Expand Down
9 changes: 0 additions & 9 deletions gemfiles/rails_4_0.gemfile

This file was deleted.

9 changes: 0 additions & 9 deletions gemfiles/rails_4_1.gemfile

This file was deleted.

0 comments on commit 7d6f369

Please sign in to comment.