Skip to content

Commit

Permalink
Merge pull request #42 from blocknotes/refactor/update-minimum-ruby-v…
Browse files Browse the repository at this point in the history
…ersion

refactor: update minimum Ruby version to 3.0
  • Loading branch information
blocknotes authored Feb 25, 2024
2 parents 22a1c87 + d346729 commit 770e069
Show file tree
Hide file tree
Showing 20 changed files with 929 additions and 1,230 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '2.7'
ruby-version: '3.0'
bundler-cache: true # runs 'bundle install' and caches installed gems automatically

- uses: reviewdog/action-setup@v1
Expand Down
42 changes: 0 additions & 42 deletions .github/workflows/specs_rails60.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/specs_rails61.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

strategy:
matrix:
ruby: ['2.6', '2.7', '3.0']
ruby: ['3.0', '3.1', '3.2']
gemfile: ['rails61_activeadmin29', 'rails61_activeadmin']

env:
Expand Down
1 change: 1 addition & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ AllCops:
- spec/dummy/**/*
- vendor/**/*
NewCops: enable
TargetRubyVersion: 3.0

RSpec/ExampleLength:
# default 5
Expand Down
18 changes: 6 additions & 12 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,17 +1,5 @@
# frozen_string_literal: true

appraise 'rails60-activeadmin22' do
gem 'activeadmin', '~> 2.2.0'
gem 'rails', '~> 6.0.0'
gem 'selenium-webdriver', require: false
end

appraise 'rails60-activeadmin' do
gem 'activeadmin'
gem 'rails', '~> 6.0.0'
gem 'selenium-webdriver', require: false
end

appraise 'rails61-activeadmin29' do
gem 'activeadmin', '~> 2.9.0'
gem 'rails', '~> 6.1.0'
Expand All @@ -27,3 +15,9 @@ appraise 'rails70-activeadmin' do
gem 'rails', '~> 7.0.0'
gem 'sprockets-rails'
end

appraise 'rails71-activeadmin' do
gem 'activeadmin'
gem 'rails', '~> 7.1.0'
gem 'sprockets-rails'
end
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ Please :star: if you like it.

## Install

_NOTE_: Ruby 2.7 is supported until version 1.1.0

After installing Active Admin, add to your Gemfile: `gem 'activeadmin_quill_editor'` (and execute *bundle*)

If you installed Active Admin without Webpacker support (default for now):
Expand Down
6 changes: 3 additions & 3 deletions activeadmin_quill_editor.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
spec.email = 'mat@blocknot.es'
spec.homepage = 'https://github.com/blocknotes/activeadmin_quill_editor'

spec.required_ruby_version = '>= 2.6.0'
spec.required_ruby_version = '>= 3.0'

spec.metadata['homepage_uri'] = spec.homepage
spec.metadata['changelog_uri'] = 'https://github.com/blocknotes/activeadmin_quill_editor/blob/main/CHANGELOG.md'
Expand All @@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
spec.files = Dir['{app,lib}/**/*', 'LICENSE.txt', 'Rakefile', 'README.md']
spec.require_paths = ['lib']

spec.add_runtime_dependency 'activeadmin', '>= 2.0', '< 4'
spec.add_runtime_dependency 'activeadmin', '>= 2.9', '< 4'

spec.add_development_dependency 'appraisal', '~> 2.4'
spec.add_development_dependency 'appraisal', '~> 2.4' # rubocop:disable Gemspec/DevelopmentDependencies
end
2 changes: 2 additions & 0 deletions gemfiles/.bundle/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
BUNDLE_RETRY: "1"
Loading

0 comments on commit 770e069

Please sign in to comment.