Skip to content

Commit

Permalink
fix: remove dependency of Rails 7 so it could run in Rails 8 too. (#61)
Browse files Browse the repository at this point in the history
  • Loading branch information
a-chacon authored Oct 11, 2024
1 parent ecf0cfe commit a57fd16
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/rubyonrails.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
gemfile: [rails-7.0, rails-7.1, rails-7.2]
gemfile: [rails-7.0, rails-7.1, rails-7.2, rails-8.0.0-beta1]
runs-on: ubuntu-latest
env:
RAILS_ENV: test
Expand All @@ -26,7 +26,7 @@ jobs:
- name: Install Ruby and gems
uses: ruby/setup-ruby@v1
with:
ruby-version: "3.1"
ruby-version: "3.2"
bundler-cache: true
- name: Run tests
run: bin/rails t
Expand Down
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ gem 'sprockets-rails'

gem 'rack-cors'

gem 'rails', '~> 7.0'

group :development, :test do
gem "rubocop"

Expand Down
11 changes: 5 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ PATH
specs:
oas_rails (0.8.1)
method_source (~> 1.0)
model-to-schema (~> 0.1.1)
rails (~> 7.0)
model-to-schema (~> 0.1.2)
yard (~> 0.9)

GEM
Expand Down Expand Up @@ -110,7 +109,7 @@ GEM
rdoc (>= 4.0.0)
reline (>= 0.4.2)
json (2.7.2)
jwt (2.9.1)
jwt (2.9.3)
base64
language_server-protocol (3.17.0.3)
logger (1.6.1)
Expand All @@ -126,8 +125,7 @@ GEM
method_source (1.1.0)
mini_mime (1.1.5)
minitest (5.25.1)
model-to-schema (0.1.1)
activerecord (~> 7.0)
model-to-schema (0.1.2)
net-imap (0.4.16)
date
net-protocol
Expand Down Expand Up @@ -244,7 +242,7 @@ GEM
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
yard (0.9.37)
zeitwerk (2.6.18)
zeitwerk (2.7.0)

PLATFORMS
aarch64-linux
Expand All @@ -263,6 +261,7 @@ DEPENDENCIES
oas_rails!
puma
rack-cors
rails (~> 7.0)
rubocop
sprockets-rails
sqlite3 (~> 1.4)
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails-7.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }

gem 'rails', '~> 7.0.0'

gem 'model-to-schema', '~> 0.1.0'
gem 'model-to-schema', '~> 0.1.2'

gem 'method_source', '~> 1.0'

Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails-7.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }

gem 'rails', '~> 7.1.0'

gem 'model-to-schema', '~> 0.1.0'
gem 'model-to-schema', '~> 0.1.2'

gem 'method_source', '~> 1.0'

Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails-7.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }

gem 'rails', '~> 7.2.0'

gem 'model-to-schema', '~> 0.1.0'
gem 'model-to-schema', '~> 0.1.2'

gem 'method_source', '~> 1.0'

Expand Down
28 changes: 28 additions & 0 deletions gemfiles/rails-8.0.0-beta1.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

gem 'rails', '~> 8.0.0.beta1'

gem 'model-to-schema', '~> 0.1.2'

gem 'method_source', '~> 1.0'

gem 'yard', '~> 0.9'

gem 'puma'

gem 'sqlite3', ">= 2.1"

gem 'sprockets-rails'

gem 'rack-cors'

group :development, :test do
gem "bcrypt", "~> 3.1.7"

gem 'factory_bot_rails'

gem 'jwt'

gem 'faker'
end
3 changes: 1 addition & 2 deletions oas_rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ Gem::Specification.new do |spec|
spec.required_ruby_version = ">= 3.1"

spec.add_dependency 'method_source', '~> 1.0'
spec.add_dependency 'model-to-schema', '~> 0.1.1' # Esquema
spec.add_dependency 'rails', '~> 7.0'
spec.add_dependency 'model-to-schema', '~> 0.1.2' # Esquema
spec.add_dependency 'yard', '~> 0.9'
end

0 comments on commit a57fd16

Please sign in to comment.