Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Limit max version of dry-validation #223

Merged
merged 20 commits into from
Jun 13, 2019
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
3 changes: 3 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
Metrics/LineLength:
Max: 120

Style/FrozenStringLiteralComment:
EnforcedStyle: never
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-2.2.2
ruby-2.4.5
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ matrix:
- rvm: 2.6.0
gemfile: gemfiles/rails_4.1.gemfile
before_install:
- gem install bundler -v '<2'
- gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
- gem install bundler -v '< 2'
script:
- bundle exec rspec
addons:
Expand Down
8 changes: 8 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,34 +1,42 @@
appraise 'rails-3' do
gem 'sqlite3', '< 1.4.0'
gem 'rails', '3.2.22.5'
end

appraise 'rails-4' do
gem 'sqlite3', '< 1.4.0'
gem 'rails', '4.0.13'
end

appraise 'rails-4.1' do
gem 'sqlite3', '< 1.4.0'
gem 'rails', '4.1.16'
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
end

appraise 'rails-4.2' do
gem 'sqlite3', '< 1.4.0'
gem 'rails', '4.2.11'
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
end

appraise 'rails-5' do
gem 'sqlite3', '< 1.4.0'
gem 'rails', '5.0.7.1'
end

appraise 'rails-5.1' do
gem 'sqlite3', '< 1.4.0'
gem 'rails', '5.1.6.1'
end

appraise 'rails-5.2' do
gem 'sqlite3', '< 1.4.0'
gem 'rails', '5.2.2'
gem 'bootsnap'
end

appraise 'sinatra' do
gem 'sqlite3', '< 1.4.0'
gem 'sinatra', '2.0.5'
end
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Unreleased

...
* Lock max version of dry-validation depending on the ruby version ([#223](https://github.com/railsconfig/config/pull/223))

## 1.7.1

Expand Down
22 changes: 17 additions & 5 deletions config.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,30 @@ Gem::Specification.new do |s|
s.require_paths = ['lib']
s.required_ruby_version = '>= 2.0.0'

s.add_dependency 'activesupport', '>= 3.0'
s.add_dependency 'deep_merge', '~> 1.2', '>= 1.2.1'
s.add_dependency 'deep_merge', '~> 1.2', '>= 1.2.1'

s.add_dependency 'dry-validation', '~> 0.10', '>= 0.10.7' if RUBY_VERSION >= '2.1' && RUBY_VERSION < '2.2'
s.add_dependency 'dry-validation', '~> 0.12', '>= 0.12.2' if RUBY_VERSION >= '2.2'
if RUBY_VERSION >= '2.2'
s.add_dependency 'activesupport', '>= 3.0'
s.add_dependency 'dry-validation', '~> 0.12', '>= 0.12.2', '< 1.0.0'

s.add_development_dependency 'rails', '~> 5.2', '>= 5.2.2'
end

if RUBY_VERSION >= '2.1' && RUBY_VERSION < '2.2'
s.add_dependency 'activesupport', '>= 3.0', '< 5.0.0'
s.add_dependency 'dry-configurable', '~> 0.5.0'
s.add_dependency 'dry-logic', '~> 0.5.0'
s.add_dependency 'dry-validation', '~> 0.10', '>= 0.10.7', '< 1.0.0'
s.add_dependency 'i18n', '~> 0.9.0'

s.add_development_dependency 'rails', '< 5.0.0'
end

s.add_development_dependency 'bundler', '~> 1.13', '>= 1.13.6'
s.add_development_dependency 'rake', '~> 12.0', '>= 12.0.0'

# Testing
s.add_development_dependency 'appraisal', '~> 2.2', '>= 2.2.0'
s.add_development_dependency 'rails', '~> 5.2', '>= 5.2.2'
s.add_development_dependency 'rspec', '~> 3.7', '>= 3.7.0'
s.add_development_dependency 'rspec-rails', '~> 3.7', '>= 3.7.2'
s.add_development_dependency 'test-unit', '~> 3.2', '>= 3.2.7'
Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails_3.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

source "https://rubygems.org"

gem "sqlite3", "< 1.4.0"
gem "rails", "3.2.22.5"

gemspec path: "../"
1 change: 1 addition & 0 deletions gemfiles/rails_4.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

source "https://rubygems.org"

gem "sqlite3", "< 1.4.0"
gem "rails", "4.1.16"
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw]

Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails_4.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

source "https://rubygems.org"

gem "sqlite3", "< 1.4.0"
gem "rails", "4.2.11"
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw]

Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails_4.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

source "https://rubygems.org"

gem "sqlite3", "< 1.4.0"
gem "rails", "4.0.13"

gemspec path: "../"
1 change: 1 addition & 0 deletions gemfiles/rails_5.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

source "https://rubygems.org"

gem "sqlite3", "< 1.4.0"
gem "rails", "5.1.6.1"

gemspec path: "../"
1 change: 1 addition & 0 deletions gemfiles/rails_5.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

source "https://rubygems.org"

gem "sqlite3", "< 1.4.0"
gem "rails", "5.2.2"
gem "bootsnap"

Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails_5.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

source "https://rubygems.org"

gem "sqlite3", "< 1.4.0"
gem "rails", "5.0.7.1"

gemspec path: "../"
1 change: 1 addition & 0 deletions gemfiles/sinatra.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

source "https://rubygems.org"

gem "sqlite3", "< 1.4.0"
gem "sinatra", "2.0.5"

gemspec path: "../"
2 changes: 1 addition & 1 deletion lib/config/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Config
VERSION = '1.7.1'
VERSION = '1.7.1'.freeze
end