Skip to content

Commit 1607c3a

Browse files
ashmarolijekyllbot
authored andcommitted
Re-introduce Ruby 2.3 support and test Jekyll 3.7+ (#72)
Merge pull request 72
1 parent b3942b5 commit 1607c3a

File tree

5 files changed

+19
-18
lines changed

5 files changed

+19
-18
lines changed

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ inherit_gem:
55
rubocop-jekyll: .rubocop.yml
66

77
AllCops:
8-
TargetRubyVersion: 2.4
8+
TargetRubyVersion: 2.3
99
Exclude:
1010
- vendor/**/*
1111
- spec/*.rb

.travis.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
11
language: ruby
22
cache: bundler
33
rvm:
4-
- 2.6
4+
- &latest_ruby 2.6
55
- 2.4
6+
- 2.3
67

78
script : script/cibuild
89

910
branches:
1011
only:
1112
- master
1213
env:
13-
- JEKYLL_VERSION=3.7.4
14-
14+
matrix:
15+
- JEKYLL_VERSION="~> 3.8"
1516
matrix:
1617
include:
1718
- # GitHub Pages
1819
rvm: 2.5.3
19-
env: GH_PAGES=true
20+
env: JEKYLL_VERSION="~> 3.7.4"
21+
- rvm: *latest_ruby
22+
env: JEKYLL_VERSION=">= 4.0.0.pre.alpha1"
2023

2124
notifications:
2225
email: false

Gemfile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,4 @@
33
source "https://rubygems.org"
44
gemspec
55

6-
if ENV["GH_PAGES"]
7-
gem "github-pages"
8-
elsif ENV["JEKYLL_VERSION"]
9-
gem "jekyll", "~> #{ENV["JEKYLL_VERSION"]}"
10-
end
6+
gem "jekyll", ENV["JEKYLL_VERSION"] if ENV["JEKYLL_VERSION"]

jekyll-gist.gemspec

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ Gem::Specification.new do |spec|
1414
spec.homepage = "https://github.com/jekyll/jekyll-gist"
1515
spec.license = "MIT"
1616

17-
spec.required_ruby_version = ">= 2.4.0"
18-
1917
spec.files = `git ls-files -z`.split("\x0")
20-
spec.executables = spec.files.grep(%r!^bin/!) { |f| File.basename(f) }
21-
spec.test_files = spec.files.grep(%r!^(test|spec|features)/!)
18+
spec.test_files = spec.files.grep(%r!^spec/!)
2219
spec.require_paths = ["lib"]
2320

24-
spec.add_dependency "octokit", "~> 4.2"
21+
spec.required_ruby_version = ">= 2.3.0"
22+
23+
spec.add_runtime_dependency "jekyll", ">= 3.7", "< 5.0"
24+
spec.add_runtime_dependency "octokit", "~> 4.2"
25+
2526
spec.add_development_dependency "bundler"
26-
spec.add_development_dependency "jekyll", ">= 3.7", "< 5.0"
2727
spec.add_development_dependency "rake"
2828
spec.add_development_dependency "rspec"
2929
spec.add_development_dependency "rubocop-jekyll", "~> 0.4"

lib/jekyll-gist/gist_tag.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ def render(context)
2424
else
2525
raise ArgumentError, <<~ERROR
2626
Syntax error in tag 'gist' while parsing the following markup:
27-
#{@markup}
28-
Valid syntax:
27+
28+
#{@markup}
29+
30+
Valid syntax:
2931
{% gist user/1234567 %}
3032
{% gist user/1234567 foo.js %}
3133
{% gist 28949e1d5ee2273f9fd3 %}

0 commit comments

Comments
 (0)