summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVít Ondruch <v.ondruch@tiscali.cz>2016-11-30 06:16:06 +0100
committerDan Allen <dan.j.allen@gmail.com>2016-11-29 22:16:06 -0700
commitb9e9474e8eb0250d21e2b273eda0e64cb8485f8e (patch)
tree6d71e441757ab0d0026dbc6b6455d032d416689b
parentfd602b75cabf9023aaab5306a7a4eb5ffcc54bf5 (diff)
upgrade to Slim 3 (PR #1953)
- upgrade to Slim 3 except for Ruby 1.8.7 - move racc dependency for rbx to Gemfile
-rw-r--r--Gemfile5
-rw-r--r--asciidoctor.gemspec3
2 files changed, 6 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 2255bdf3..fa9ff7f7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,6 +3,11 @@ source 'https://rubygems.org'
# Look in asciidoctor.gemspec for runtime and development dependencies
gemspec
+group :development do
+ gem 'racc', '~> 1.4.10' if RUBY_VERSION == '2.1.0' && RUBY_ENGINE == 'rbx'
+ gem 'slim', '~> 2.0.0' unless (Gem::Version.new RUBY_VERSION) >= (Gem::Version.new '1.9.2')
+end
+
# enable this group to use Guard for continuous testing
# after removing comments, run `bundle install` then `guard`
#group :guardtest do
diff --git a/asciidoctor.gemspec b/asciidoctor.gemspec
index 7a2c4362..aaf73a3f 100644
--- a/asciidoctor.gemspec
+++ b/asciidoctor.gemspec
@@ -38,12 +38,11 @@ Gem::Specification.new do |s|
s.add_development_dependency 'rake', '~> 10.0.0'
s.add_development_dependency 'rspec-expectations', '~> 2.14.0'
# slim is needed for testing custom templates
- s.add_development_dependency 'slim', '~> 2.0.0'
+ s.add_development_dependency 'slim', '~> 3.0.0'
s.add_development_dependency 'thread_safe', '~> 0.3.4'
# tilt is needed for testing custom templates
s.add_development_dependency 'tilt', '~> 2.0.0'
s.add_development_dependency 'yard', '~> 0.8.7'
s.add_development_dependency 'yard-tomdoc', '~> 0.7.0'
s.add_development_dependency 'minitest', '~> 5.3.0'
- s.add_development_dependency 'racc', '~> 1.4.10' if RUBY_VERSION == '2.1.0' && RUBY_ENGINE == 'rbx'
end