Skip to content

Commit

Permalink
Merge branch 'dev' of github.com:andymeneely/squib into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
andymeneely committed Dec 14, 2024
2 parents 4e47b81 + 1132233 commit 4405efd
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 22 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu, macos]
ruby: [2.7, 3.0, head]
runs-on: ${{ matrix.os }}-latest
continue-on-error: ${{ endsWith(matrix.ruby, 'head') || (matrix.ruby == '3.0' && matrix.os == 'macos')}}
ruby: ['3.0', '3.1', '3.2', head]
runs-on: ${{ matrix.os }}
continue-on-error: ${{ endsWith(matrix.ruby, 'head') }}
steps:
- uses: actions/checkout@v2
- uses: ruby/setup-ruby@v1
Expand Down
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"restructuredtext.confPath": "${workspaceFolder}\\docs",
"restructuredtext.linter.disabled": true
"restructuredtext.linter.disabled": true,
"esbonio.sphinx.confDir": "${workspaceFolder}\\docs"
}
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
# Squib CHANGELOG
Squib follows [semantic versioning](http://semver.org).

## v0.18.0 / Unreleased
## v0.19.0 / 2023-04-08

Chores:
* Bumping dependencies, which should fix installation issues (e.g. [#376](https://github.com/andymeneely/squib/issues/376))

## v0.18.0 / 2021-10-26

Features:
* Placeholders! Missing images to `svg` and `png` can be replaced by a `placeholder` (#339)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Wanna see more? Check out the website: http://andymeneely.github.io/squib/

## Installation

Squib requires Ruby 2.7 or later.
Squib requires Ruby 3.0 or later.

Install it yourself with:

Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@
# built documents.
#
# The short X.Y version.
version = u'v0.18'
version = u'v0.19'
# The full version, including alpha/beta/rc tags.
release = u'v0.18.0'
release = u'v0.19.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion lib/squib/card.rb
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def use_cairo(&block)

def finish!
begin
@cairo_surface.finish
@cairo_surface.finish unless @backend.to_sym == :svg
rescue Cairo::SurfaceFinishedError
# do nothin - if it's already finished that's fine
end
Expand Down
26 changes: 13 additions & 13 deletions squib.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
spec.specification_version = 2 if spec.respond_to? :specification_version=
spec.required_rubygems_version = Gem::Requirement.new('>= 0') if spec.respond_to? :required_rubygems_version=
spec.rubygems_version = '2.2.2'
spec.required_ruby_version = '>= 2.7.0'
spec.required_ruby_version = '>= 3.0.0'

spec.name = 'squib'
spec.version = Squib::VERSION
Expand All @@ -31,18 +31,18 @@ Gem::Specification.new do |spec|
spec.test_files = spec.files.grep(/^(spec|samples|docs|benchmarks)\//)
spec.require_paths = ['lib']

spec.add_runtime_dependency 'cairo', '~> 1.17'
spec.add_runtime_dependency 'classy_hash', '1.0.0'
spec.add_runtime_dependency 'gio2', '~> 3.4'
spec.add_runtime_dependency 'gobject-introspection', '~> 3.4'
spec.add_runtime_dependency 'highline', '2.0.3'
spec.add_runtime_dependency 'mercenary', '0.4.0'
spec.add_runtime_dependency 'nokogiri', '~> 1.11'
spec.add_runtime_dependency 'pango', '~> 3.4'
spec.add_runtime_dependency 'rainbow', '~> 3.0'
spec.add_runtime_dependency 'roo', '~> 2.8'
spec.add_runtime_dependency 'rsvg2', '~> 3.4'
spec.add_runtime_dependency 'ruby-progressbar', '~> 1.11'
spec.add_runtime_dependency 'cairo', '~> 1.17', '>= 1.17.8' # https://rubygems.org/gems/cairo/
spec.add_runtime_dependency 'classy_hash', '1.0.0' # https://rubygems.org/gems/classy_hash
spec.add_runtime_dependency 'gio2', '~> 4.1', '>= 4.1.2' # https://rubygems.org/gems/gio2
spec.add_runtime_dependency 'gobject-introspection', '~> 4.1', '>= 4.1.2' # https://rubygems.org/gems/gobject-introspection
spec.add_runtime_dependency 'highline', '2.1.0' # https://rubygems.org/gems/highline
spec.add_runtime_dependency 'mercenary', '0.4.0' # https://rubygems.org/gems/mercenary
spec.add_runtime_dependency 'nokogiri', '~> 1.14', '>= 1.14.2' # https://rubygems.org/gems/nokogiri
spec.add_runtime_dependency 'pango', '~> 4.1', '>= 4.1.2' # https://rubygems.org/gems/pango
spec.add_runtime_dependency 'rainbow', '~> 3.1' # https://rubygems.org/gems/rainbow
spec.add_runtime_dependency 'roo', '~> 2.9' # https://rubygems.org/gems/roo
spec.add_runtime_dependency 'rsvg2', '~> 4.1', '>= 4.1.2' # https://rubygems.org/gems/rsvg2
spec.add_runtime_dependency 'ruby-progressbar', '~> 1.11' # https://rubygems.org/gems/ruby-progressbar

spec.add_development_dependency 'activesupport'
spec.add_development_dependency 'bundler'
Expand Down

0 comments on commit 4405efd

Please sign in to comment.