Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Provide support for Jekyll 3 #72

Merged
merged 4 commits into from
Nov 11, 2015
Merged

Provide support for Jekyll 3 #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
896f28a
Provide support for Jekyll 3
gjtorikian Sep 19, 2015
79558d2
Specify Ruby versions for Travis
gjtorikian Nov 11, 2015
6c44fed
Oh, Ben. :disappointed:
gjtorikian Nov 11, 2015
1218a56
Try a dependency trick for Ruby < 2
gjtorikian Nov 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
language: ruby
rvm:
- 1.9.3
- 2.0
- 2.1
- 2.2
script: "./script/cibuild"

before_script:
Expand Down
11 changes: 8 additions & 3 deletions jekyll-auth.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ require './lib/jekyll_auth/version'
Gem::Specification.new do |s|
s.name = "jekyll-auth"
s.version = JekyllAuth::VERSION
s.summary = "A simple way to use Github OAuth to serve a protected jekyll site to your GitHub organization"
s.description = "A simple way to use Github Oauth to serve a protected jekyll site to your GitHub organization."
s.summary = "A simple way to use GitHub OAuth to serve a protected jekyll site to your GitHub organization"
s.description = "A simple way to use GitHub OAuth to serve a protected jekyll site to your GitHub organization."
s.authors = "Ben Balter"
s.email = "[email protected]"
s.homepage = "https://github.com/benbalter/jekyll-auth"
Expand All @@ -14,7 +14,12 @@ Gem::Specification.new do |s|
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
s.require_paths = ["lib"]

s.add_dependency "jekyll", "~> 2.0"
if RUBY_VERSION =~ /1.9.3/
s.add_dependency "jekyll", "~> 2.0"
else
s.add_dependency "jekyll", ">= 2.0"
end

s.add_dependency "sinatra-index", "~> 0.0"
s.add_dependency "sinatra_auth_github", "~> 1.1"
s.add_dependency "rack", "~> 1.6"
Expand Down