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.

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

Attempt at making Travis happy about Asciidoctor 2.0 #216

Merged
merged 7 commits into from
Nov 6, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 Gemfile.upstream
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,8 @@
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
# TODO: remove once this PR is merged https://github.com/jirutka/asciidoctor-templates-compiler/pull/4
# and asciidoctor-templates-compiler > v0.4.1 is shipped
gem 'asciidoctor-templates-compiler', :git => 'https://github.com/obilodeau/asciidoctor-templates-compiler', :branch => 'patch-1'
11 changes: 10 additions & 1 deletion README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,16 @@ A {uri-revealjs-gh}/wiki/Plugins,-Tools-and-Hardware[list of existing reveal.js

== Minimum Requirements

* asciidoctor 1.5.6
Our requirements are expressed in our packages and by our dependencies.
Basically, all you need is the package manager of the flavor of Asciidoctor-Reveal.js you are interested to run:

* With Ruby / Bundler: A https://www.ruby-lang.org/en/downloads/[recent Ruby] and https://bundler.io/[Bundler]
* With Javascript (Node.js) / NPM: a https://nodejs.org/en/download/[recent Node.js] environment

If you need more details about our dependencies check out Asciidoctor dependencies:

* With Ruby / Bundler: https://asciidoctor.org/#requirements[Asciidoctor] 1.5.6
* With Javascript (Node.js) / NPM: https://github.com/asciidoctor/asciidoctor.js/blob/v1.5.6/package.json[Asciidoctor.js] 1.5.6

== Copyright and Licensing

Expand Down
1 change: 0 additions & 1 deletion Rakefile
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
4 changes: 2 additions & 2 deletions asciidoctor-revealjs.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ 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'

files = begin
if (result = Open3.popen3('git ls-files -z') {|_, out| out.read }.split %(\0)).empty?
Expand All @@ -30,8 +29,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