Skip to content

Commit 49ac549

Browse files
authored
ci: bump rails to the latest versions and add missing deps (#371)
1 parent d7c85d9 commit 49ac549

File tree

9 files changed

+19
-12
lines changed

9 files changed

+19
-12
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- 3.1
2424
- 3.2
2525
- 3.3
26-
- jruby
26+
- jruby-9
2727
- truffleruby
2828
steps:
2929
- name: Checkout

Appraisals

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ end
2121
appraise 'rails-6.1' do
2222
gem 'activerecord-jdbcsqlite3-adapter', '~> 61.1', platform: :jruby
2323
gem 'bootsnap', '>= 1.4.4'
24-
gem 'rails', '6.1.7.6'
24+
gem 'drb', '~> 2.2' if RUBY_VERSION >= '3.4'
25+
gem 'mutex_m', '~> 0.2.0' if RUBY_VERSION >= '3.4'
26+
gem 'rails', '6.1.7.10'
2527
gem 'rspec-rails', '~> 5.0'
2628
gem 'sqlite3', '~> 1.4', platform: :ruby
2729
gem 'psych', '>= 4'
@@ -35,7 +37,9 @@ if RUBY_ENGINE == 'ruby' && RUBY_VERSION >= '2.7'
3537
gem 'activerecord-jdbcsqlite3-adapter', '~> 70.1', platform: :jruby
3638
gem 'sqlite3', '~> 1.6.4', platform: :ruby
3739
gem 'bootsnap', '>= 1.4.4'
38-
gem 'rails', '7.0.8'
40+
gem 'drb', '~> 2.2' if RUBY_VERSION >= '3.4'
41+
gem 'mutex_m', '~> 0.2.0' if RUBY_VERSION >= '3.4'
42+
gem 'rails', '7.0.8.7'
3943
gem 'rspec-rails', '~> 6.0.3'
4044
gem 'sprockets-rails', '~> 3.4.2'
4145
gem 'psych', '>= 4'
@@ -45,7 +49,7 @@ if RUBY_ENGINE == 'ruby' && RUBY_VERSION >= '2.7'
4549
gem 'activerecord-jdbcsqlite3-adapter', '~> 70.1', platform: :jruby
4650
gem 'sqlite3', '~> 1.6.6', platform: :ruby
4751
gem 'bootsnap', '>= 1.16.0'
48-
gem 'rails', '7.1.0'
52+
gem 'rails', '7.1.5.1'
4953
gem 'rspec-rails', '~> 6.0.3'
5054
gem 'sprockets-rails', '~> 3.4.2'
5155
gem 'psych', '>= 4'

config.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ Gem::Specification.new do |s|
3030
s.add_dependency 'deep_merge', '~> 1.2', '>= 1.2.1'
3131
s.add_dependency 'ostruct'
3232

33-
s.add_development_dependency 'dry-validation', *Config::DryValidationRequirements::VERSIONS
3433
s.add_development_dependency 'rake', '~> 12.0', '>= 12.0.0'
3534

3635
# Testing
3736
s.add_development_dependency 'appraisal', '~> 2.5', '>= 2.5.0'
37+
s.add_development_dependency 'dry-validation', *Config::DryValidationRequirements::VERSIONS
3838
s.add_development_dependency 'rspec', '~> 3.9', '>= 3.9.0'
3939

4040
# Default RSpec run will test against latest Rails app

gemfiles/rails_6.1.gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ source "https://rubygems.org"
44

55
gem "activerecord-jdbcsqlite3-adapter", "~> 61.1", platform: :jruby
66
gem "bootsnap", ">= 1.4.4"
7-
gem "rails", "6.1.7.6"
7+
gem "drb", "~> 2.2"
8+
gem "mutex_m", "~> 0.2.0"
9+
gem "rails", "6.1.7.10"
810
gem "rspec-rails", "~> 5.0"
911
gem "sqlite3", "~> 1.4", platform: :ruby
1012
gem "psych", ">= 4"

gemfiles/rails_7.0.gemfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ source "https://rubygems.org"
55
gem "activerecord-jdbcsqlite3-adapter", "~> 70.1", platform: :jruby
66
gem "sqlite3", "~> 1.6.4", platform: :ruby
77
gem "bootsnap", ">= 1.4.4"
8-
gem "rails", "7.0.8"
8+
gem "drb", "~> 2.2"
9+
gem "mutex_m", "~> 0.2.0"
10+
gem "rails", "7.0.8.7"
911
gem "rspec-rails", "~> 6.0.3"
1012
gem "sprockets-rails", "~> 3.4.2"
1113
gem "psych", ">= 4"

gemfiles/rails_7.1.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source "https://rubygems.org"
55
gem "activerecord-jdbcsqlite3-adapter", "~> 70.1", platform: :jruby
66
gem "sqlite3", "~> 1.6.6", platform: :ruby
77
gem "bootsnap", ">= 1.16.0"
8-
gem "rails", "7.1.0"
8+
gem "rails", "7.1.5.1"
99
gem "rspec-rails", "~> 6.0.3"
1010
gem "sprockets-rails", "~> 3.4.2"
1111
gem "psych", ">= 4"

lib/config/dry_validation_requirements.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ def self.load_dry_validation!
1414
raise LoadError
1515
end
1616
rescue LoadError
17-
raise ::Config::Error, 'Could not find a dry-validation version' \
18-
' matching requirements' \
19-
" (#{VERSIONS.map(&:inspect) * ','})"
17+
raise ::Config::Error, "Could not find a dry-validation version matching requirements (#{VERSIONS.map(&:inspect) * ','})"
2018
end
2119

2220
require 'dry/validation'

spec/spec_helper.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
case app_framework
3434
when 'rails'
3535
# Load Rails
36+
require 'logger'
3637
require_relative "app/#{app_name}/config/environment"
3738

3839
APP_RAKEFILE = File.expand_path("../app/#{app_name}/Rakefile", __FILE__)

spec/validation_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
require 'spec_helper'
2-
require 'dry-validation'
2+
require 'dry/validation'
33

44
describe Config do
55
context 'validation' do

0 commit comments

Comments
 (0)