From ac65dc17803b915e0770f7b0ca2b11afb573cdd3 Mon Sep 17 00:00:00 2001 From: Thiago Pradi Date: Sun, 25 Aug 2019 22:35:54 -0300 Subject: [PATCH 01/10] Gemfile / gemspec files compatible with Rails 6 --- .ruby-version | 2 +- Gemfile | 2 +- rswag-api/rswag-api.gemspec | 2 +- rswag-specs/rswag-specs.gemspec | 4 ++-- rswag-ui/rswag-ui.gemspec | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.ruby-version b/.ruby-version index 2bf1c1c..ec1cf33 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.3.1 +2.6.3 diff --git a/Gemfile b/Gemfile index bbd3d73..d351ace 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ gem 'rails', "#{rails_version}" case rails_version.split('.').first when '3' gem 'strong_parameters' -when '4', '5' +when '4', '5', '6' gem 'responders' end diff --git a/rswag-api/rswag-api.gemspec b/rswag-api/rswag-api.gemspec index 299172d..3a14bb2 100644 --- a/rswag-api/rswag-api.gemspec +++ b/rswag-api/rswag-api.gemspec @@ -13,5 +13,5 @@ Gem::Specification.new do |s| s.files = Dir["{lib}/**/*"] + ["MIT-LICENSE", "Rakefile"] - s.add_dependency 'railties', '>= 3.1', '< 6.0' + s.add_dependency 'railties', '>= 3.1', '< 6.1' end diff --git a/rswag-specs/rswag-specs.gemspec b/rswag-specs/rswag-specs.gemspec index 0e4686e..e3ddaf3 100644 --- a/rswag-specs/rswag-specs.gemspec +++ b/rswag-specs/rswag-specs.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |s| s.files = Dir["{lib}/**/*"] + ["MIT-LICENSE", "Rakefile" ] - s.add_dependency 'activesupport', '>= 3.1', '< 6.0' - s.add_dependency 'railties', '>= 3.1', '< 6.0' + s.add_dependency 'activesupport', '>= 3.1', '< 6.1' + s.add_dependency 'railties', '>= 3.1', '< 6.1' s.add_dependency 'json-schema', '~> 2.2' end diff --git a/rswag-ui/rswag-ui.gemspec b/rswag-ui/rswag-ui.gemspec index 5b53548..1584470 100644 --- a/rswag-ui/rswag-ui.gemspec +++ b/rswag-ui/rswag-ui.gemspec @@ -13,6 +13,6 @@ Gem::Specification.new do |s| s.files = Dir.glob("{lib,node_modules}/**/*") + ["MIT-LICENSE", "Rakefile" ] - s.add_dependency 'actionpack', '>=3.1', '< 6.0' - s.add_dependency 'railties', '>= 3.1', '< 6.0' + s.add_dependency 'actionpack', '>=3.1', '< 6.1' + s.add_dependency 'railties', '>= 3.1', '< 6.1' end From 621d6f47540df542a451d330386dde452365f4a4 Mon Sep 17 00:00:00 2001 From: Thiago Pradi Date: Sun, 25 Aug 2019 22:37:22 -0300 Subject: [PATCH 02/10] Updating travis file and adding Rails 6 to build matrix --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index bdf321a..ce0f6fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,17 @@ language: ruby rvm: - - 2.2.5 + - 2.6.3 env: + - RAILS_VERSION=6.0.0 - RAILS_VERSION=5.2.0 - RAILS_VERSION=4.2.0 - RAILS_VERSION=3.2.22 cache: directories: - - /home/travis/.rvm/gems/ruby-2.2.5 + - /home/travis/.rvm/gems/ruby-2.6.3 install: ./ci/build.sh From 16458d458ac3adfdb8b8b021afeac9fddd7444c6 Mon Sep 17 00:00:00 2001 From: Thiago Pradi Date: Sun, 25 Aug 2019 22:45:12 -0300 Subject: [PATCH 03/10] Adding extra lib to fix build --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index ce0f6fd..2327462 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,12 @@ env: - RAILS_VERSION=4.2.0 - RAILS_VERSION=3.2.22 +addons: + apt: + packages: + - libqtwebkit-dev + - libqtwebkit4 + cache: directories: - /home/travis/.rvm/gems/ruby-2.6.3 From 7179802fe07e5650375dfa17d78bd981522fcbf1 Mon Sep 17 00:00:00 2001 From: Thiago Pradi Date: Sun, 25 Aug 2019 22:50:28 -0300 Subject: [PATCH 04/10] Using alternative config for xfvb --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2327462..2e9171b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,9 @@ language: ruby +dist: xenial +services: + - xvfb + rvm: - 2.6.3 @@ -21,11 +25,6 @@ cache: install: ./ci/build.sh -before_script: - - export DISPLAY=:99.0 - - sh -e /etc/init.d/xvfb start - - sleep 3 - script: ./ci/test.sh jobs: From d37933801716d6e6ff3a30053d95512f81b65d4f Mon Sep 17 00:00:00 2001 From: Thiago Pradi Date: Sun, 25 Aug 2019 23:00:07 -0300 Subject: [PATCH 05/10] Enforce SQlite version --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index d351ace..a688e2c 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ when '4', '5', '6' gem 'responders' end -gem 'sqlite3' +gem 'sqlite3', '1.4.1' gem 'rswag-api', path: './rswag-api' gem 'rswag-ui', path: './rswag-ui' From 586d0211ff06f33023c49ad4bfc427afa6a25095 Mon Sep 17 00:00:00 2001 From: Thiago Pradi Date: Sun, 25 Aug 2019 23:06:19 -0300 Subject: [PATCH 06/10] Force SQlite 1.3 version --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index a688e2c..c9ebb7b 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ when '4', '5', '6' gem 'responders' end -gem 'sqlite3', '1.4.1' +gem 'sqlite3', '~> 1.3.6' gem 'rswag-api', path: './rswag-api' gem 'rswag-ui', path: './rswag-ui' From 91a0f88eb5d96753cbda8593ed75dcb2b1c4671f Mon Sep 17 00:00:00 2001 From: Thiago Pradi Date: Sun, 25 Aug 2019 23:11:57 -0300 Subject: [PATCH 07/10] Use different Sqlite versions for Rails versions --- Gemfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index c9ebb7b..c9d5c4e 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,12 @@ when '4', '5', '6' gem 'responders' end -gem 'sqlite3', '~> 1.3.6' +case rails_version.split('.').first +when '3', '4', '5' + gem 'sqlite3', '~> 1.3.6' +when '6' + gem 'sqlite3', '~> 1.4.1' +end gem 'rswag-api', path: './rswag-api' gem 'rswag-ui', path: './rswag-ui' From 81f8e0dbaff7aef176991808e31f56054d00856a Mon Sep 17 00:00:00 2001 From: Thiago Pradi Date: Sun, 25 Aug 2019 23:19:03 -0300 Subject: [PATCH 08/10] Removing Rails 3/4 - they are not supported by the Rails Core Team --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2e9171b..f9edbb2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,8 +10,6 @@ rvm: env: - RAILS_VERSION=6.0.0 - RAILS_VERSION=5.2.0 - - RAILS_VERSION=4.2.0 - - RAILS_VERSION=3.2.22 addons: apt: From 6c684729d11336fb77365d0a04214f3151c2d089 Mon Sep 17 00:00:00 2001 From: Thiago Pradi Date: Mon, 23 Sep 2019 22:56:24 -0300 Subject: [PATCH 09/10] Use updated ruby version --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index ec1cf33..2714f53 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.6.3 +2.6.4 From 4bdbd7ed9843e6e1fb10e0e414f53f67e9d71608 Mon Sep 17 00:00:00 2001 From: Thiago Pradi Date: Mon, 23 Sep 2019 23:03:09 -0300 Subject: [PATCH 10/10] Use updated ruby on CI too --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f9edbb2..304c64c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ services: - xvfb rvm: - - 2.6.3 + - 2.6.4 env: - RAILS_VERSION=6.0.0 @@ -19,7 +19,7 @@ addons: cache: directories: - - /home/travis/.rvm/gems/ruby-2.6.3 + - /home/travis/.rvm/gems/ruby-2.6.4 install: ./ci/build.sh