From 0ee8175c1f72452d78453bf5b464c289651f55ae Mon Sep 17 00:00:00 2001 From: David Jones Date: Sun, 19 Dec 2021 08:34:53 -0500 Subject: [PATCH 1/2] Test with Rails 7 --- .github/workflows/ci.yml | 2 ++ gemfiles/7.0.gemfile | 11 +++++++++++ 2 files changed, 13 insertions(+) create mode 100644 gemfiles/7.0.gemfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 70345894..f9110bce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,6 +29,8 @@ jobs: ruby-version: 2.7 - gemfile: "6.1" ruby-version: 3.0 + - gemfile: "7.0" + ruby-version: 3.0 env: BUNDLE_GEMFILE: /home/runner/work/wicked_pdf/wicked_pdf/gemfiles/${{ matrix.gemfile }}.gemfile diff --git a/gemfiles/7.0.gemfile b/gemfiles/7.0.gemfile new file mode 100644 index 00000000..4c5fcf04 --- /dev/null +++ b/gemfiles/7.0.gemfile @@ -0,0 +1,11 @@ +source 'https://rubygems.org' + +gem 'bundler', '~>2' +gem 'mocha', '= 1.3' # newer versions blow up +gem 'rails', '~>7.0.0' +gem 'rdoc' +gem 'sprockets', '~>3.0' +gem 'sqlite3', '~> 1.4' +gem 'rubocop', '1.11.0' + +gemspec :path => '../' From 177e5cfca30b0d084cf2c3ed053d5f59088f4655 Mon Sep 17 00:00:00 2001 From: David Jones Date: Sun, 19 Dec 2021 08:45:33 -0500 Subject: [PATCH 2/2] Add webpacker to 6.1 gemfile --- .github/workflows/ci.yml | 2 -- README.md | 2 +- gemfiles/6.1.gemfile | 1 + gemfiles/7.0.gemfile | 11 ----------- wicked_pdf.gemspec | 1 - 5 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 gemfiles/7.0.gemfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f9110bce..70345894 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,8 +29,6 @@ jobs: ruby-version: 2.7 - gemfile: "6.1" ruby-version: 3.0 - - gemfile: "7.0" - ruby-version: 3.0 env: BUNDLE_GEMFILE: /home/runner/work/wicked_pdf/wicked_pdf/gemfiles/${{ matrix.gemfile }}.gemfile diff --git a/README.md b/README.md index cc413e02..71087d47 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Wicked PDF [![Gem Version](https://badge.fury.io/rb/wicked_pdf.svg)](http://badge.fury.io/rb/wicked_pdf) [![Build Status](https://secure.travis-ci.org/mileszs/wicked_pdf.svg)](http://travis-ci.org/mileszs/wicked_pdf) [![Code Climate](https://codeclimate.com/github/mileszs/wicked_pdf/badges/gpa.svg)](https://codeclimate.com/github/mileszs/wicked_pdf) [![Open Source Helpers](https://www.codetriage.com/mileszs/wicked_pdf/badges/users.svg)](https://www.codetriage.com/mileszs/wicked_pdf) +# Wicked PDF [![Gem Version](https://badge.fury.io/rb/wicked_pdf.svg)](http://badge.fury.io/rb/wicked_pdf) [![Build Status](https://github.com/mileszs/wicked_pdf/actions/workflows/ci.yml/badge.svg)](https://github.com/mileszs/wicked_pdf/actions/workflows/ci.yml) [![Code Climate](https://codeclimate.com/github/mileszs/wicked_pdf/badges/gpa.svg)](https://codeclimate.com/github/mileszs/wicked_pdf) [![Open Source Helpers](https://www.codetriage.com/mileszs/wicked_pdf/badges/users.svg)](https://www.codetriage.com/mileszs/wicked_pdf) ## A PDF generation plugin for Ruby on Rails diff --git a/gemfiles/6.1.gemfile b/gemfiles/6.1.gemfile index 77fdbd12..da2b3794 100644 --- a/gemfiles/6.1.gemfile +++ b/gemfiles/6.1.gemfile @@ -4,6 +4,7 @@ gem 'bootsnap' # required to run `rake test` in Rails 6.1 gem 'bundler', '~>2' gem 'mocha', '= 1.3' # newer versions blow up gem 'rails', '~>6.1.0' +gem 'webpacker' gem 'rdoc' gem 'sprockets', '~>3.0' gem 'sqlite3', '~> 1.4' diff --git a/gemfiles/7.0.gemfile b/gemfiles/7.0.gemfile deleted file mode 100644 index 4c5fcf04..00000000 --- a/gemfiles/7.0.gemfile +++ /dev/null @@ -1,11 +0,0 @@ -source 'https://rubygems.org' - -gem 'bundler', '~>2' -gem 'mocha', '= 1.3' # newer versions blow up -gem 'rails', '~>7.0.0' -gem 'rdoc' -gem 'sprockets', '~>3.0' -gem 'sqlite3', '~> 1.4' -gem 'rubocop', '1.11.0' - -gemspec :path => '../' diff --git a/wicked_pdf.gemspec b/wicked_pdf.gemspec index a42fb1bf..a0cb3257 100644 --- a/wicked_pdf.gemspec +++ b/wicked_pdf.gemspec @@ -31,7 +31,6 @@ DESC spec.add_dependency 'activesupport' - spec.add_development_dependency 'bootsnap' spec.add_development_dependency 'bundler' spec.add_development_dependency 'mocha', '= 1.3' spec.add_development_dependency 'rails'