Skip to content

Commit

Permalink
update with rails 7
Browse files Browse the repository at this point in the history
  • Loading branch information
OlgaCoskun authored and n3bulous committed Apr 26, 2023
1 parent 0492e38 commit 095a8a9
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 20 deletions.
21 changes: 5 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,14 @@ gemfile:
- gemfiles/rails_5.2.gemfile
- gemfiles/rails_6.0.gemfile
- gemfiles/rails_6.1.gemfile
- gemfiles/rails_7.0.gemfile

jobs:
fast_finish: true
allow_failures:
- rvm: ruby-head
exclude:
- rvm: 2.5.8
gemfile: gemfiles/rails_6.0.gemfile
- rvm: 2.5.8
gemfile: gemfiles/rails_6.1.gemfile
- rvm: 2.7.2
gemfile: gemfiles/rails_5.0.gemfile
- rvm: 2.7.2
gemfile: gemfiles/rails_5.1.gemfile
- rvm: 2.7.2
gemfile: gemfiles/rails_5.2.gemfile
- rvm: 3.0.0
gemfile: gemfiles/rails_5.0.gemfile
- rvm: 3.0.0
gemfile: gemfiles/rails_5.1.gemfile
- rvm: 3.0.0
gemfile: gemfiles/rails_5.2.gemfile
- rvm: 3.0.6
gemfile: gemfiles/rails_7.0.gemfile
- rvm: 3.0.6
gemfile: gemfiles/rails_6.1.gemfile
4 changes: 4 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ appraise "rails-6.0" do
gem 'rails', '~> 6.0.0'
end

appraise "rails-7.0" do
gem 'rails', '~> 7.0.4.2'
end

appraise "rails-6.1" do
gem 'rails', '~> 6.1.0'
end
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## 2.3.0 - 13 Mart 2023

Added support and appraisal for Rails 7.0 since it is released.

## 2.2.0 - 20 September 2019

Added support and appraisal for Rails 6.0 since it is released.

## 2.1.0 - 14 May 2015

Added `:only` (as well as `:to`) for specifying actions in `allow`/`deny`
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
PATH
remote: .
specs:
acl9 (3.2.0)
rails (>= 5.0, < 7.0)
acl9 (3.3.0)
rails (> 5.0, < 8.0)

GEM
remote: http://rubygems.org/
Expand Down
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,16 @@ permissions correct.
Acl9 is [Semantically Versioned](http://semver.org/), so just add this to your
`Gemfile` (note that you need 3.2 for Rails 6+ support):

### Rails 7 - stick with 2.7

```ruby
gem 'acl9', '~> 4.0'
```

You will need Ruby 2.7.x

### Rails 5,6 - stick with 2.x

```ruby
gem 'acl9', '~> 3.2'
```
Expand Down
2 changes: 1 addition & 1 deletion acl9.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Gem::Specification.new do |s|

s.rdoc_options = ["--charset=UTF-8"]

s.add_dependency "rails", '>= 5.0', '< 7.0'
s.add_dependency "rails", '> 5.0', '< 8.0'

s.add_development_dependency "yard"
s.add_development_dependency 'sqlite3'
Expand Down
9 changes: 9 additions & 0 deletions gemfiles/rails_7.0.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# This file was generated by Appraisal

source "http://rubygems.org"

gem "appraisal"
gem "byebug"
gem "rails", "~> 7.0.4.2"

gemspec path: "../"
2 changes: 1 addition & 1 deletion lib/acl9/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Acl9
VERSION = "3.2.0"
VERSION = "3.3.0"
end

0 comments on commit 095a8a9

Please sign in to comment.