Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- 3.1
- 3.2
- 3.3
- jruby
- jruby-9
- truffleruby
steps:
- name: Checkout
Expand Down
10 changes: 7 additions & 3 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ end
appraise 'rails-6.1' do
gem 'activerecord-jdbcsqlite3-adapter', '~> 61.1', platform: :jruby
gem 'bootsnap', '>= 1.4.4'
gem 'rails', '6.1.7.6'
gem 'drb', '~> 2.2' if RUBY_VERSION >= '3.4'
gem 'mutex_m', '~> 0.2.0' if RUBY_VERSION >= '3.4'
gem 'rails', '6.1.7.10'
gem 'rspec-rails', '~> 5.0'
gem 'sqlite3', '~> 1.4', platform: :ruby
gem 'psych', '>= 4'
Expand All @@ -35,7 +37,9 @@ if RUBY_ENGINE == 'ruby' && RUBY_VERSION >= '2.7'
gem 'activerecord-jdbcsqlite3-adapter', '~> 70.1', platform: :jruby
gem 'sqlite3', '~> 1.6.4', platform: :ruby
gem 'bootsnap', '>= 1.4.4'
gem 'rails', '7.0.8'
gem 'drb', '~> 2.2' if RUBY_VERSION >= '3.4'
gem 'mutex_m', '~> 0.2.0' if RUBY_VERSION >= '3.4'
gem 'rails', '7.0.8.7'
gem 'rspec-rails', '~> 6.0.3'
gem 'sprockets-rails', '~> 3.4.2'
gem 'psych', '>= 4'
Expand All @@ -45,7 +49,7 @@ if RUBY_ENGINE == 'ruby' && RUBY_VERSION >= '2.7'
gem 'activerecord-jdbcsqlite3-adapter', '~> 70.1', platform: :jruby
gem 'sqlite3', '~> 1.6.6', platform: :ruby
gem 'bootsnap', '>= 1.16.0'
gem 'rails', '7.1.0'
gem 'rails', '7.1.5.1'
gem 'rspec-rails', '~> 6.0.3'
gem 'sprockets-rails', '~> 3.4.2'
gem 'psych', '>= 4'
Expand Down
2 changes: 1 addition & 1 deletion config.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ Gem::Specification.new do |s|
s.add_dependency 'deep_merge', '~> 1.2', '>= 1.2.1'
s.add_dependency 'ostruct'

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

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

# Default RSpec run will test against latest Rails app
Expand Down
4 changes: 3 additions & 1 deletion gemfiles/rails_6.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ source "https://rubygems.org"

gem "activerecord-jdbcsqlite3-adapter", "~> 61.1", platform: :jruby
gem "bootsnap", ">= 1.4.4"
gem "rails", "6.1.7.6"
gem "drb", "~> 2.2"
gem "mutex_m", "~> 0.2.0"
gem "rails", "6.1.7.10"
gem "rspec-rails", "~> 5.0"
gem "sqlite3", "~> 1.4", platform: :ruby
gem "psych", ">= 4"
Expand Down
4 changes: 3 additions & 1 deletion gemfiles/rails_7.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ source "https://rubygems.org"
gem "activerecord-jdbcsqlite3-adapter", "~> 70.1", platform: :jruby
gem "sqlite3", "~> 1.6.4", platform: :ruby
gem "bootsnap", ">= 1.4.4"
gem "rails", "7.0.8"
gem "drb", "~> 2.2"
gem "mutex_m", "~> 0.2.0"
gem "rails", "7.0.8.7"
gem "rspec-rails", "~> 6.0.3"
gem "sprockets-rails", "~> 3.4.2"
gem "psych", ">= 4"
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 @@ -5,7 +5,7 @@ source "https://rubygems.org"
gem "activerecord-jdbcsqlite3-adapter", "~> 70.1", platform: :jruby
gem "sqlite3", "~> 1.6.6", platform: :ruby
gem "bootsnap", ">= 1.16.0"
gem "rails", "7.1.0"
gem "rails", "7.1.5.1"
gem "rspec-rails", "~> 6.0.3"
gem "sprockets-rails", "~> 3.4.2"
gem "psych", ">= 4"
Expand Down
4 changes: 1 addition & 3 deletions lib/config/dry_validation_requirements.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ def self.load_dry_validation!
raise LoadError
end
rescue LoadError
raise ::Config::Error, 'Could not find a dry-validation version' \
' matching requirements' \
" (#{VERSIONS.map(&:inspect) * ','})"
raise ::Config::Error, "Could not find a dry-validation version matching requirements (#{VERSIONS.map(&:inspect) * ','})"
end

require 'dry/validation'
Expand Down
1 change: 1 addition & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
case app_framework
when 'rails'
# Load Rails
require 'logger'
require_relative "app/#{app_name}/config/environment"

APP_RAKEFILE = File.expand_path("../app/#{app_name}/Rakefile", __FILE__)
Expand Down
2 changes: 1 addition & 1 deletion spec/validation_spec.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
require 'spec_helper'
require 'dry-validation'
require 'dry/validation'

describe Config do
context 'validation' do
Expand Down