Skip to content

Commit

Permalink
Merge pull request premailer#411 from premailer/grosser/bump
Browse files Browse the repository at this point in the history
fix ruby 3.0
  • Loading branch information
grosser committed Oct 30, 2021
2 parents 08fe1c1 + ec4de6c commit d17f1ee
Show file tree
Hide file tree
Showing 5 changed files with 72 additions and 51 deletions.
21 changes: 21 additions & 0 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: CI
on:
push:
branches: [master]
pull_request:
branches: [master]
jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
task: ["test"]
ruby: [ '2.5', '2.6', '2.7', '3.0' ]
name: ${{ matrix.ruby }} rake ${{ matrix.task }}
steps:
- uses: actions/checkout@v2
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
- run: bundle exec rake ${{ matrix.task }}
13 changes: 0 additions & 13 deletions .travis.yml

This file was deleted.

65 changes: 39 additions & 26 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,55 +9,68 @@ PATH
GEM
remote: https://rubygems.org/
specs:
addressable (2.7.0)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
bump (0.9.0)
coderay (1.1.2)
bump (0.10.0)
coderay (1.1.3)
coveralls (0.8.23)
json (>= 1.8, < 3)
simplecov (~> 0.16.1)
term-ansicolor (~> 1.3)
thor (>= 0.19.4, < 2.0)
tins (~> 1.6)
crack (0.4.3)
safe_yaml (~> 1.0.0)
css_parser (1.9.0)
crack (0.4.5)
rexml
css_parser (1.10.0)
addressable
docile (1.3.2)
hashdiff (1.0.0)
docile (1.4.0)
ffi (1.15.4-java)
hashdiff (1.0.1)
htmlentities (4.3.4)
json (2.2.0)
maxitest (3.3.0)
minitest (>= 5.0.0, < 5.12.0)
method_source (0.9.2)
jruby-openssl (0.11.0-java)
json (2.6.1)
json (2.6.1-java)
maxitest (4.1.0)
minitest (>= 5.0.0, < 5.15.0)
method_source (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
minitest (5.14.4)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
nokogumbo (2.0.1)
nokogiri (1.8.5-java)
nokogumbo (2.0.5)
nokogiri (~> 1.8, >= 1.8.4)
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (4.0.1)
rake (12.3.3)
redcarpet (3.5.0)
safe_yaml (1.0.5)
pry (0.14.1)
coderay (~> 1.1)
method_source (~> 1.0)
pry (0.14.1-java)
coderay (~> 1.1)
method_source (~> 1.0)
spoon (~> 0.0)
public_suffix (4.0.6)
rake (13.0.6)
redcarpet (3.5.1)
rexml (3.2.5)
simplecov (0.16.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
spoon (0.0.6)
ffi
sync (0.5.0)
term-ansicolor (1.7.1)
tins (~> 1.0)
thor (0.20.3)
tins (1.21.1)
webmock (3.7.5)
addressable (>= 2.3.6)
thor (1.1.0)
tins (1.29.1)
sync
webmock (3.14.0)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)

PLATFORMS
java
ruby

DEPENDENCIES
Expand All @@ -75,4 +88,4 @@ DEPENDENCIES
webmock

BUNDLED WITH
2.1.4
2.2.0.rc.2
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Premailer README [![Build Status](https://travis-ci.org/premailer/premailer.svg?branch=master)](https://travis-ci.org/premailer/premailer) [![Gem Version](https://badge.fury.io/rb/premailer.svg)](https://badge.fury.io/rb/premailer)
# Premailer README [![CI](https://github.com/premailer/premailer/actions/workflows/actions.yml/badge.svg)](https://github.com/premailer/premailer/actions/workflows/actions.yml) [![Gem Version](https://badge.fury.io/rb/premailer.svg)](https://badge.fury.io/rb/premailer)

## What is this?

Expand Down Expand Up @@ -68,7 +68,7 @@ Premailer::Adapter.use = :nokogiri_fast

## Ruby Compatibility

See .travis.yml for which ruby versions are tested. JRuby support is close, contributors are welcome. Checkout the latest build status on the [Travis CI dashboard](https://travis-ci.org/#!/premailer/premailer).
See .github/workflows/actions.yml for which ruby versions are tested. JRuby support is close, contributors are welcome.

## Premailer-specific CSS

Expand Down
20 changes: 10 additions & 10 deletions premailer.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ Gem::Specification.new "premailer", Premailer::VERSION do |s|
s.required_ruby_version = '>= 2.5.0'
s.metadata["yard.run"] = "yri" # use "yard" to build full HTML docs.

s.add_runtime_dependency('css_parser', '>= 1.6.0')
s.add_runtime_dependency('htmlentities', ['>= 4.0.0'])
s.add_runtime_dependency 'css_parser', '>= 1.6.0'
s.add_runtime_dependency 'htmlentities', ['>= 4.0.0']
s.add_runtime_dependency 'addressable'
s.add_development_dependency "bundler", ">= 1.3"
s.add_development_dependency('rake', ['> 0.8', '!= 0.9.0'])
s.add_development_dependency('nokogiri', '~> 1.8.2')
s.add_development_dependency('redcarpet', '~> 3.0')
s.add_development_dependency('maxitest')
s.add_development_dependency('coveralls')
s.add_development_dependency('webmock')
s.add_development_dependency('nokogumbo')
s.add_development_dependency('bump')
s.add_development_dependency 'rake', ['> 0.8', '!= 0.9.0']
s.add_development_dependency 'nokogiri', '~> 1.8.2'
s.add_development_dependency 'redcarpet', '~> 3.0'
s.add_development_dependency 'maxitest'
s.add_development_dependency 'coveralls'
s.add_development_dependency 'webmock'
s.add_development_dependency 'nokogumbo'
s.add_development_dependency 'bump'
end

0 comments on commit d17f1ee

Please sign in to comment.