Skip to content

Commit

Permalink
Prepare 4.6 release
Browse files Browse the repository at this point in the history
For compatibility with the yearly Christmas release of Ruby (this time
v2.6). Note I dropped the (unused anyway) ZenTest dependency, which
otherwise complains:

    ZenTest-4.11.0 requires rubygems version < 3.0, which is
    incompatible with the current version, 3.0.1

Updated local Ruby install first with:

    ruby-install ruby 2.6.0

For some reason, chruby doesn't pick it up (probably because I didn't
start a new shell), so I:

    export PATH=~/.rubies/ruby-2.6.0/bin:$PATH
  • Loading branch information
wincent committed Dec 25, 2018
1 parent e2ec462 commit 6c14d4d
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.5.0
2.6.0
6 changes: 2 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
PATH
remote: .
specs:
wikitext (4.5)
wikitext (4.6)

GEM
remote: https://rubygems.org/
specs:
ZenTest (4.11.0)
diff-lcs (1.2.5)
rake (10.4.2)
rspec (2.99.0)
Expand All @@ -25,7 +24,6 @@ PLATFORMS
ruby

DEPENDENCIES
ZenTest (~> 4.9)
rake (~> 10.0)
rspec (~> 2.13)
thor (~> 0.17.0)
Expand All @@ -34,4 +32,4 @@ DEPENDENCIES
yard (~> 0.9.12)

BUNDLED WITH
1.16.1
1.17.2
4 changes: 4 additions & 0 deletions doc/RELEASE-NOTES
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ require any user or developer action are generally not included
in these release notes. For a full listing of all changes see
the source code repository at: http://git.wincent.com.

= Changes in 4.6

* add official support for Ruby 2.6.x

= Changes in 4.5

* add official support for Ruby 2.5.x
Expand Down
2 changes: 1 addition & 1 deletion ext/wikitext/extconf.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def missing item
exit 1
end

if RUBY_VERSION !~ /\A2\.[0-5](\.|$)/
if RUBY_VERSION !~ /\A2\.[0-6](\.|$)/
raise "unsupported Ruby version: #{RUBY_VERSION}"
end

Expand Down
2 changes: 1 addition & 1 deletion lib/wikitext/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@
# POSSIBILITY OF SUCH DAMAGE.

module Wikitext
VERSION = '4.5'
VERSION = '4.6'
end # module Wikitext
1 change: 0 additions & 1 deletion wikitext.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,4 @@ Gem::Specification.new do |s|
s.add_development_dependency 'thor', '~> 0.17.0'
s.add_development_dependency 'yard', '~> 0.9.12'
s.add_development_dependency 'wopen3', '~> 0.3'
s.add_development_dependency 'ZenTest', '~> 4.9'
end

0 comments on commit 6c14d4d

Please sign in to comment.