Skip to content

Commit

Permalink
Improve dependencies settings
Browse files Browse the repository at this point in the history
  • Loading branch information
n-rodriguez committed Aug 5, 2024
1 parent 1751471 commit f808c15
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 30 deletions.
17 changes: 16 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,19 @@ source 'https://rubygems.org'
gemspec

gem 'appraisal', git: 'https://github.com/n-rodriguez/appraisal.git', branch: 'wip/combustion'
gem 'combustion', git: 'https://github.com/pat/combustion.git'

# gem 'activerecord-oracle_enhanced-adapter'
gem 'combustion'
gem 'database_cleaner'
gem 'factory_bot'
gem 'faker'
gem 'generator_spec'
gem 'guard-rspec'
gem 'pg'
gem 'pry'
gem 'puma'
gem 'rake'
gem 'rspec'
gem 'rspec-retry'
gem 'rubocop'
gem 'simplecov'
22 changes: 2 additions & 20 deletions ajax-datatables-rails.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,6 @@ Gem::Specification.new do |s|

s.files = `git ls-files`.split("\n")

s.add_runtime_dependency 'rails', '>= 6.1'
s.add_runtime_dependency 'zeitwerk'

s.add_development_dependency 'activerecord-oracle_enhanced-adapter'
s.add_development_dependency 'appraisal'
s.add_development_dependency 'combustion', '~> 1.3'
s.add_development_dependency 'database_cleaner'
s.add_development_dependency 'factory_bot'
s.add_development_dependency 'faker'
s.add_development_dependency 'generator_spec'
s.add_development_dependency 'guard-rspec'
s.add_development_dependency 'pg'
s.add_development_dependency 'pry'
s.add_development_dependency 'puma'
s.add_development_dependency 'rake'
s.add_development_dependency 'rspec'
s.add_development_dependency 'rspec-retry'
s.add_development_dependency 'rubocop'
s.add_development_dependency 'simplecov'
s.add_development_dependency 'sqlite3', '~> 1.5.0'
s.add_dependency 'rails', '>= 6.1'
s.add_dependency 'zeitwerk'
end
6 changes: 3 additions & 3 deletions appraisal.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
6.1.7:
sqlite3:
version: ~> 1.4.0
version: ~> 1.5.0
install_if: '-> { ENV["DB_ADAPTER"] == "sqlite3" }'
mysql2:
version: ''
Expand Down Expand Up @@ -34,7 +34,7 @@

7.0.8:
sqlite3:
version: ~> 1.4.0
version: ~> 1.5.0
install_if: '-> { ENV["DB_ADAPTER"] == "sqlite3" }'
mysql2:
version: ''
Expand Down Expand Up @@ -67,7 +67,7 @@

7.1.0:
sqlite3:
version: ~> 1.4.0
version: ~> 1.5.0
install_if: '-> { ENV["DB_ADAPTER"] == "sqlite3" }'
mysql2:
version: ''
Expand Down
17 changes: 15 additions & 2 deletions gemfiles/rails_6.1.7.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,24 @@
source "https://rubygems.org"

gem "appraisal", git: "https://github.com/n-rodriguez/appraisal.git", branch: "wip/combustion"
gem "combustion", git: "https://github.com/pat/combustion.git"
gem "combustion"
gem "database_cleaner"
gem "factory_bot"
gem "faker"
gem "generator_spec"
gem "guard-rspec"
gem "pg"
gem "pry"
gem "puma"
gem "rake"
gem "rspec"
gem "rspec-retry"
gem "rubocop"
gem "simplecov"
gem "rails", "6.1.7"

install_if -> { ENV["DB_ADAPTER"] == "sqlite3" } do
gem "sqlite3", "~> 1.4.0"
gem "sqlite3", "~> 1.5.0"
end

install_if -> { ENV["DB_ADAPTER"] == "mysql2" } do
Expand Down
17 changes: 15 additions & 2 deletions gemfiles/rails_7.0.8.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,24 @@
source "https://rubygems.org"

gem "appraisal", git: "https://github.com/n-rodriguez/appraisal.git", branch: "wip/combustion"
gem "combustion", git: "https://github.com/pat/combustion.git"
gem "combustion"
gem "database_cleaner"
gem "factory_bot"
gem "faker"
gem "generator_spec"
gem "guard-rspec"
gem "pg"
gem "pry"
gem "puma"
gem "rake"
gem "rspec"
gem "rspec-retry"
gem "rubocop"
gem "simplecov"
gem "rails", "7.0.8"

install_if -> { ENV["DB_ADAPTER"] == "sqlite3" } do
gem "sqlite3", "~> 1.4.0"
gem "sqlite3", "~> 1.5.0"
end

install_if -> { ENV["DB_ADAPTER"] == "mysql2" } do
Expand Down
17 changes: 15 additions & 2 deletions gemfiles/rails_7.1.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,24 @@
source "https://rubygems.org"

gem "appraisal", git: "https://github.com/n-rodriguez/appraisal.git", branch: "wip/combustion"
gem "combustion", git: "https://github.com/pat/combustion.git"
gem "combustion"
gem "database_cleaner"
gem "factory_bot"
gem "faker"
gem "generator_spec"
gem "guard-rspec"
gem "pg"
gem "pry"
gem "puma"
gem "rake"
gem "rspec"
gem "rspec-retry"
gem "rubocop"
gem "simplecov"
gem "rails", "7.1.0"

install_if -> { ENV["DB_ADAPTER"] == "sqlite3" } do
gem "sqlite3", "~> 1.4.0"
gem "sqlite3", "~> 1.5.0"
end

install_if -> { ENV["DB_ADAPTER"] == "mysql2" } do
Expand Down

0 comments on commit f808c15

Please sign in to comment.