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

Jump to bottom

Attempt at making Travis happy about Asciidoctor 2.0 #216

Merged
merged 7 commits into from
Nov 6, 2018
Merged

Attempt at making Travis happy about Asciidoctor 2.0 #216

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1fbb170
Attempt at making Travis happy about Asciidoctor 2.0
obilodeau Oct 30, 2018
d655cff
Removed a dependant that seemed unworthy
obilodeau Oct 30, 2018
cfe1a45
Added back thread_safe and concurrent-ruby
obilodeau Oct 30, 2018
6471391
Asciidoctor 2.0: Force use of asciidoctor-doctest from git
obilodeau Nov 5, 2018
bc49841
Less strict definition of Ruby requirement
obilodeau Nov 5, 2018
4fce207
As advised by Dan, dropping minimum Ruby version check
obilodeau Nov 6, 2018
ec622e0
Asciidoctor 2.0: Force use of my git patched clone of a-t-c
obilodeau Nov 6, 2018
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
2 changes: 2 additions & 0 deletions Gemfile.upstream
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@
source 'https://rubygems.org'
gemspec
gem 'asciidoctor', :git => 'https://github.com/asciidoctor/asciidoctor', :branch => 'master'
# TODO: remove once asciidoctor-doctest > v2.0.0-beta4 is shipped
gem 'asciidoctor-doctest', :git => 'https://github.com/asciidoctor/asciidoctor-doctest', :branch => 'master'
obilodeau marked this conversation as resolved.
Show resolved Hide resolved
1 change: 0 additions & 1 deletion Rakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
require 'asciidoctor'
require 'asciidoctor/doctest'
require 'colorize'
require 'thread_safe'
require 'tilt'

CONVERTER_FILE = 'lib/asciidoctor-revealjs/converter.rb'
Expand Down
5 changes: 3 additions & 2 deletions asciidoctor-revealjs.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Gem::Specification.new do |s|
s.summary = 'Converts AsciiDoc to HTML for a Reveal.js presentation'
s.description = 'Reveal.JS back-end for Asciidoctor and Asciidoctor.js. Write slides in AsciiDoc!'
s.license = 'MIT'
s.required_ruby_version = '>= 1.9.3'
s.required_ruby_version = '>= 2.3.0'
obilodeau marked this conversation as resolved.
Show resolved Hide resolved

files = begin
if (result = Open3.popen3('git ls-files -z') {|_, out| out.read }.split %(\0)).empty?
Expand All @@ -30,8 +30,9 @@ Gem::Specification.new do |s|
s.extra_rdoc_files = Dir['README.adoc', 'LICENSE.adoc', 'HACKING.adoc']
s.require_paths = ['lib']

s.add_runtime_dependency 'asciidoctor', '~> 1.5.6'
s.add_runtime_dependency 'asciidoctor', ['>= 1.5.6', '< 2.1']
s.add_runtime_dependency 'thread_safe', '~> 0.3.5'
s.add_runtime_dependency 'concurrent-ruby', '~> 1.0'

s.add_development_dependency 'rake', '~> 10.4.2'
s.add_development_dependency 'asciidoctor-doctest', '= 2.0.0.beta.4'
Expand Down