Skip to content

Commit

Permalink
[#11] Remove old ruby and rails versions from the supported versions
Browse files Browse the repository at this point in the history
  • Loading branch information
rpbaltazar committed Apr 2, 2020
1 parent 504588e commit 228401e
Show file tree
Hide file tree
Showing 8 changed files with 55 additions and 76 deletions.
5 changes: 1 addition & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ services:
- docker
rvm:
- jruby-9.2.11.0
- 2.1.9
- 2.2.9
- 2.3.6
- 2.4.3
- 2.5.0
- 2.6.2
Expand All @@ -19,12 +16,12 @@ branches:
- development

gemfile:
- gemfiles/rails_4_2.gemfile
- gemfiles/rails_5_0.gemfile
- gemfiles/rails_5_1.gemfile
- gemfiles/rails_5_2.gemfile
- gemfiles/rails_6_0.gemfile
- gemfiles/rails_master.gemfile

bundler_args: --without local
before_install:
- sudo /etc/init.d/mysql stop
Expand Down
21 changes: 4 additions & 17 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
# frozen_string_literal: true

appraise 'rails-4-2' do
gem 'rails', '~> 4.2.0'
platforms :ruby do
gem 'pg', '< 1.0.0'
gem 'mysql2', '~> 0.4.0'
end
platforms :jruby do
gem 'activerecord-jdbc-adapter', '~> 1.3'
gem 'activerecord-jdbcpostgresql-adapter', '~> 1.3'
gem 'activerecord-jdbcmysql-adapter', '~> 1.3'
end
end

appraise 'rails-5-0' do
gem 'rails', '~> 5.0.0'
platforms :ruby do
Expand Down Expand Up @@ -47,14 +34,14 @@ appraise 'rails-5-2' do
end

appraise 'rails-6-0' do
gem 'rails', '~> 6.0.0.rc1'
gem 'rails', '~> 6.0.0'
platforms :ruby do
gem 'sqlite3', '~> 1.4'
end
platforms :jruby do
gem 'activerecord-jdbc-adapter', '~> 60.0.rc1'
gem 'activerecord-jdbcpostgresql-adapter', '~> 60.0.rc1'
gem 'activerecord-jdbcmysql-adapter', '~> 60.0.rc1'
gem 'activerecord-jdbc-adapter', '~> 60.0'
gem 'activerecord-jdbcpostgresql-adapter', '~> 60.0'
gem 'activerecord-jdbcmysql-adapter', '~> 60.0'
end
end

Expand Down
2 changes: 1 addition & 1 deletion apartment.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Gem::Specification.new do |s|
s.licenses = ['MIT']

# must be >= 3.1.2 due to bug in prepared_statements
s.add_dependency 'activerecord', '>= 3.1.2', '< 6.1'
s.add_dependency 'activerecord', '>= 5.0.0', '< 6.1'
s.add_dependency 'parallel', '< 2.0'
s.add_dependency 'public_suffix', '>= 2.0.5', '< 5.0'
s.add_dependency 'rack', '>= 1.3.6', '< 3.0'
Expand Down
21 changes: 10 additions & 11 deletions gemfiles/rails_5_0.gemfile
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source 'http://rubygems.org'
source "http://rubygems.org"

gem 'rails', '~> 5.0.0'
gem "rails", "~> 5.0.0"
gem "perx-rubocop", "~> 0.0.3"

group :local do
gem 'guard-rspec', '~> 4.2'
gem 'pry'
gem "guard-rspec", "~> 4.2"
gem "pry"
end

platforms :ruby do
gem 'pg', '< 1.0.0'
gem "pg", "< 1.0.0"
end

platforms :jruby do
gem 'activerecord-jdbc-adapter', '~> 50.0'
gem 'activerecord-jdbcmysql-adapter', '~> 50.0'
gem 'activerecord-jdbcpostgresql-adapter', '~> 50.0'
gem "activerecord-jdbc-adapter", "~> 50.0"
gem "activerecord-jdbcpostgresql-adapter", "~> 50.0"
gem "activerecord-jdbcmysql-adapter", "~> 50.0"
end

gemspec path: '../'
gemspec path: "../"
21 changes: 10 additions & 11 deletions gemfiles/rails_5_1.gemfile
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source 'http://rubygems.org'
source "http://rubygems.org"

gem 'rails', '~> 5.1.0'
gem "rails", "~> 5.1.0"
gem "perx-rubocop", "~> 0.0.3"

group :local do
gem 'guard-rspec', '~> 4.2'
gem 'pry'
gem "guard-rspec", "~> 4.2"
gem "pry"
end

platforms :ruby do
gem 'pg', '< 1.0.0'
gem "pg", "< 1.0.0"
end

platforms :jruby do
gem 'activerecord-jdbc-adapter', '~> 51.0'
gem 'activerecord-jdbcmysql-adapter', '~> 51.0'
gem 'activerecord-jdbcpostgresql-adapter', '~> 51.0'
gem "activerecord-jdbc-adapter", "~> 51.0"
gem "activerecord-jdbcpostgresql-adapter", "~> 51.0"
gem "activerecord-jdbcmysql-adapter", "~> 51.0"
end

gemspec path: '../'
gemspec path: "../"
19 changes: 9 additions & 10 deletions gemfiles/rails_5_2.gemfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source 'http://rubygems.org'
source "http://rubygems.org"

gem 'rails', '~> 5.2.0'
gem "rails", "~> 5.2.0"
gem "perx-rubocop", "~> 0.0.3"

group :local do
gem 'guard-rspec', '~> 4.2'
gem 'pry'
gem "guard-rspec", "~> 4.2"
gem "pry"
end

platforms :jruby do
gem 'activerecord-jdbc-adapter', '~> 52.0'
gem 'activerecord-jdbcmysql-adapter', '~> 52.0'
gem 'activerecord-jdbcpostgresql-adapter', '~> 52.0'
gem "activerecord-jdbc-adapter", "~> 52.0"
gem "activerecord-jdbcpostgresql-adapter", "~> 52.0"
gem "activerecord-jdbcmysql-adapter", "~> 52.0"
end

gemspec path: '../'
gemspec path: "../"
21 changes: 10 additions & 11 deletions gemfiles/rails_6_0.gemfile
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source 'http://rubygems.org'
source "http://rubygems.org"

gem 'rails', '~> 6.0.0.rc1'
gem "rails", "~> 6.0.0"
gem "perx-rubocop", "~> 0.0.3"

group :local do
gem 'guard-rspec', '~> 4.2'
gem 'pry'
gem "guard-rspec", "~> 4.2"
gem "pry"
end

platforms :ruby do
gem 'sqlite3', '~> 1.4'
gem "sqlite3", "~> 1.4"
end

platforms :jruby do
gem 'activerecord-jdbc-adapter', '~> 60.0.rc1'
gem 'activerecord-jdbcmysql-adapter', '~> 60.0.rc1'
gem 'activerecord-jdbcpostgresql-adapter', '~> 60.0.rc1'
gem "activerecord-jdbc-adapter", "~> 60.0"
gem "activerecord-jdbcpostgresql-adapter", "~> 60.0"
gem "activerecord-jdbcmysql-adapter", "~> 60.0"
end

gemspec path: '../'
gemspec path: "../"
21 changes: 10 additions & 11 deletions gemfiles/rails_master.gemfile
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
# frozen_string_literal: true

# This file was generated by Appraisal

source 'http://rubygems.org'
source "http://rubygems.org"

gem 'rails', git: 'https://github.com/rails/rails.git'
gem "rails", git: "https://github.com/rails/rails.git"
gem "perx-rubocop", "~> 0.0.3"

group :local do
gem 'guard-rspec', '~> 4.2'
gem 'pry'
gem "guard-rspec", "~> 4.2"
gem "pry"
end

platforms :ruby do
gem 'sqlite3', '~> 1.4'
gem "sqlite3", "~> 1.4"
end

platforms :jruby do
gem 'activerecord-jdbc-adapter', '~> 52.0'
gem 'activerecord-jdbcmysql-adapter', '~> 52.0'
gem 'activerecord-jdbcpostgresql-adapter', '~> 52.0'
gem "activerecord-jdbc-adapter", "~> 52.0"
gem "activerecord-jdbcpostgresql-adapter", "~> 52.0"
gem "activerecord-jdbcmysql-adapter", "~> 52.0"
end

gemspec path: '../'
gemspec path: "../"

0 comments on commit 228401e

Please sign in to comment.