Skip to content

Commit

Permalink
Put 1.9.3 support back
Browse files Browse the repository at this point in the history
  • Loading branch information
pitr-ch committed Nov 1, 2018
1 parent ea7877d commit 737a822
Show file tree
Hide file tree
Showing 188 changed files with 173 additions and 74 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
Expand Up @@ -36,13 +36,18 @@ matrix:
rvm: 2.1.10
- name: MRI 2.0.0
rvm: 2.0.0
- name: MRI 1.9.3
rvm: 1.9.3

- name: JRuby 9.1.17.0
rvm: jruby-9.1.17.0
jdk: oraclejdk8
- name: JRuby 9.0.5.0
rvm: jruby-9.0.5.0
jdk: oraclejdk8
- name: JRuby 1.7.27
rvm: jruby-1.7.27
jdk: oraclejdk8

- name: MRI head
rvm: ruby-head
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,13 @@
## Current

## Release v1.1.1, edge v0.4.1 (1 Nov 2018)

* (#768) add support for 1.9.3 back

## Release v1.1.0, edge v0.4.0 (31 OCt 2018) (yanked)

* (#768) yanked because of issues with removed 1.9.3 support

## Release v1.1.0.pre2, edge v0.4.0.pre2 (18 Sep 2018)

concurrent-ruby:
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

require_relative 'lib/concurrent/version'
require File.join(File.dirname(__FILE__ ), 'lib/concurrent/version')

no_path = ENV['NO_PATH']
options = no_path ? {} : { path: '.' }
Expand Down
8 changes: 6 additions & 2 deletions README.md
Expand Up @@ -227,8 +227,12 @@ be obeyed though. Features developed in `concurrent-ruby-edge` are expected to m

## Supported Ruby versions

MRI 2.0 and above, JRuby 9000, TruffleRuby are supported.
This gem should be fully compatible with any interpreter that is compliant with Ruby 2.0 or newer.
* MRI 2.0 and above
* JRuby 9000
* TruffleRuby are supported.
* Any Ruby interpreter that is compliant with Ruby 2.0 or newer.

Actually we still support mri 1.9.3 and jruby 1.7.27 but we are looking at ways how to drop the support.
Java 8 is preferred for JRuby but every Java version on which JRuby 9000 runs is supported.

The legacy support for Rubinius is kept but it is no longer maintained, if you would like to help
Expand Down
5 changes: 3 additions & 2 deletions Rakefile
Expand Up @@ -2,6 +2,7 @@

require_relative 'lib/concurrent/version'
require_relative 'lib/concurrent/utility/engine'
require_relative 'lib/concurrent/utility/193'

core_gemspec = Gem::Specification.load File.join(__dir__, 'concurrent-ruby.gemspec')
ext_gemspec = Gem::Specification.load File.join(__dir__, 'concurrent-ruby-ext.gemspec')
Expand All @@ -16,8 +17,8 @@ class ConcurrentRubyJavaExtensionTask < Rake::JavaExtensionTask
jruby_cpath = nil
if RUBY_PLATFORM =~ /java/
begin
cpath = Java::java.lang.System.getProperty('java.class.path').split(File::PATH_SEPARATOR)
cpath += Java::java.lang.System.getProperty('sun.boot.class.path').split(File::PATH_SEPARATOR)
cpath = Java::java.lang.System.getProperty('java.class.path').split(File::PATH_SEPARATOR)
cpath += Java::java.lang.System.getProperty('sun.boot.class.path').split(File::PATH_SEPARATOR)
jruby_cpath = cpath.compact.join(File::PATH_SEPARATOR)
rescue => e
end
Expand Down
4 changes: 2 additions & 2 deletions concurrent-ruby-edge.gemspec
@@ -1,4 +1,4 @@
require_relative 'lib/concurrent/version'
require File.join(File.dirname(__FILE__ ), 'lib/concurrent/version')

Gem::Specification.new do |s|
git_files = `git ls-files`.split("\n")
Expand All @@ -22,7 +22,7 @@ be obeyed though. Features developed in `concurrent-ruby-edge` are expected to m
Please see http://concurrent-ruby.com for more information.
TXT

s.required_ruby_version = '>= 2.0.0'
s.required_ruby_version = '>= 1.9.3'

s.add_runtime_dependency 'concurrent-ruby', "~> #{Concurrent::VERSION}"
end
4 changes: 2 additions & 2 deletions concurrent-ruby-ext.gemspec
@@ -1,4 +1,4 @@
require_relative 'lib/concurrent/version'
require File.join(File.dirname(__FILE__ ), 'lib/concurrent/version')

Gem::Specification.new do |s|
s.name = 'concurrent-ruby-ext'
Expand All @@ -21,7 +21,7 @@ Gem::Specification.new do |s|
s.require_paths = ['lib']
s.extensions = 'ext/concurrent-ruby-ext/extconf.rb'

s.required_ruby_version = '>= 2.0.0'
s.required_ruby_version = '>= 1.9.3'

s.add_runtime_dependency 'concurrent-ruby', "= #{Concurrent::VERSION}"
end
6 changes: 3 additions & 3 deletions concurrent-ruby.gemspec
@@ -1,5 +1,5 @@
require_relative 'lib/concurrent/version'
require_relative 'lib/concurrent/utility/engine'
require File.join(File.dirname(__FILE__ ), 'lib/concurrent/version')
require File.join(File.dirname(__FILE__ ), 'lib/concurrent/utility/engine')

Gem::Specification.new do |s|
git_files = `git ls-files`.split("\n")
Expand All @@ -25,5 +25,5 @@ Gem::Specification.new do |s|
Inspired by Erlang, Clojure, Go, JavaScript, actors, and classic concurrency patterns.
TXT

s.required_ruby_version = '>= 2.0.0'
s.required_ruby_version = '>= 1.9.3'
end
2 changes: 1 addition & 1 deletion docs-source/signpost.md
Expand Up @@ -3,5 +3,5 @@
Pick a version:

* [master](./master/index.html)
* [1.1.0](./1.1.0/index.html)
* [1.1.1](./1.1.1/index.html)
* [1.0.5](./1.0.5/index.html)
14 changes: 10 additions & 4 deletions docs/1.1.0/Concurrent.html → docs/1.1.1/Concurrent.html
Expand Up @@ -343,8 +343,14 @@ <h3>Edge Features</h3>

<h2>Supported Ruby versions</h2>

<p>MRI 2.0 and above, JRuby 9000, TruffleRuby are supported.
This gem should be fully compatible with any interpreter that is compliant with Ruby 2.0 or newer.
<ul>
<li>MRI 2.0 and above</li>
<li>JRuby 9000</li>
<li>TruffleRuby are supported. </li>
<li>Any Ruby interpreter that is compliant with Ruby 2.0 or newer.</li>
</ul>

<p>Actually we still support mri 1.9.3 and jruby 1.7.27 but we are looking at ways how to drop the support.
Java 8 is preferred for JRuby but every Java version on which JRuby 9000 runs is supported.</p>

<p>The legacy support for Rubinius is kept but it is no longer maintained, if you would like to help
Expand Down Expand Up @@ -653,12 +659,12 @@ <h2>
<dt id="VERSION-constant" class="">VERSION =

</dt>
<dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>1.1.0</span><span class='tstring_end'>&#39;</span></span></pre></dd>
<dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>1.1.1</span><span class='tstring_end'>&#39;</span></span></pre></dd>

<dt id="EDGE_VERSION-constant" class="">EDGE_VERSION =

</dt>
<dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>0.4.0</span><span class='tstring_end'>&#39;</span></span></pre></dd>
<dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>0.4.1</span><span class='tstring_end'>&#39;</span></span></pre></dd>

<dt id="NULL_LOGGER-constant" class="">NULL_LOGGER =
<div class="docstring">
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
13 changes: 13 additions & 0 deletions docs/1.1.0/file.CHANGELOG.html → docs/1.1.1/file.CHANGELOG.html
Expand Up @@ -59,6 +59,18 @@

<div id="content"><div id='filecontents'><h2>Current</h2>

<h2>Release v1.1.1, edge v0.4.1 (1 Nov 2018)</h2>

<ul>
<li>(#768) add support for 1.9.3 back </li>
</ul>

<h2>Release v1.1.0, edge v0.4.0 (31 OCt 2018) (yanked)</h2>

<ul>
<li>(#768) yanked because of issues with removed 1.9.3 support </li>
</ul>

<h2>Release v1.1.0.pre2, edge v0.4.0.pre2 (18 Sep 2018)</h2>

<p>concurrent-ruby:</p>
Expand All @@ -80,6 +92,7 @@ <h2>Release v1.1.0.pre1, edge v0.4.0.pre1 (15 Aug 2018)</h2>
<p>concurrent-ruby:</p>

<ul>
<li>requires at least Ruby 2.0</li>
<li><a href="http://ruby-concurrency.github.io/concurrent-ruby/1.1.0/Concurrent/Promises.html">Promises</a>
are moved from <code>concurrent-ruby-edge</code> to <code>concurrent-ruby</code></li>
<li>Add support for TruffleRuby
Expand Down
File renamed without changes.
10 changes: 8 additions & 2 deletions docs/1.1.0/file.README.html → docs/1.1.1/file.README.html
Expand Up @@ -313,8 +313,14 @@ <h3>Edge Features</h3>

<h2>Supported Ruby versions</h2>

<p>MRI 2.0 and above, JRuby 9000, TruffleRuby are supported.
This gem should be fully compatible with any interpreter that is compliant with Ruby 2.0 or newer.
<ul>
<li>MRI 2.0 and above</li>
<li>JRuby 9000</li>
<li>TruffleRuby are supported. </li>
<li>Any Ruby interpreter that is compliant with Ruby 2.0 or newer.</li>
</ul>

<p>Actually we still support mri 1.9.3 and jruby 1.7.27 but we are looking at ways how to drop the support.
Java 8 is preferred for JRuby but every Java version on which JRuby 9000 runs is supported.</p>

<p>The legacy support for Rubinius is kept but it is no longer maintained, if you would like to help
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 8 additions & 2 deletions docs/1.1.0/index.html → docs/1.1.1/index.html
Expand Up @@ -313,8 +313,14 @@ <h3>Edge Features</h3>

<h2>Supported Ruby versions</h2>

<p>MRI 2.0 and above, JRuby 9000, TruffleRuby are supported.
This gem should be fully compatible with any interpreter that is compliant with Ruby 2.0 or newer.
<ul>
<li>MRI 2.0 and above</li>
<li>JRuby 9000</li>
<li>TruffleRuby are supported. </li>
<li>Any Ruby interpreter that is compliant with Ruby 2.0 or newer.</li>
</ul>

<p>Actually we still support mri 1.9.3 and jruby 1.7.27 but we are looking at ways how to drop the support.
Java 8 is preferred for JRuby but every Java version on which JRuby 9000 runs is supported.</p>

<p>The legacy support for Rubinius is kept but it is no longer maintained, if you would like to help
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
14 changes: 10 additions & 4 deletions docs/master/Concurrent.html
Expand Up @@ -343,8 +343,14 @@ <h3>Edge Features</h3>

<h2>Supported Ruby versions</h2>

<p>MRI 2.0 and above, JRuby 9000, TruffleRuby are supported.
This gem should be fully compatible with any interpreter that is compliant with Ruby 2.0 or newer.
<ul>
<li>MRI 2.0 and above</li>
<li>JRuby 9000</li>
<li>TruffleRuby are supported. </li>
<li>Any Ruby interpreter that is compliant with Ruby 2.0 or newer.</li>
</ul>

<p>Actually we still support mri 1.9.3 and jruby 1.7.27 but we are looking at ways how to drop the support.
Java 8 is preferred for JRuby but every Java version on which JRuby 9000 runs is supported.</p>

<p>The legacy support for Rubinius is kept but it is no longer maintained, if you would like to help
Expand Down Expand Up @@ -653,12 +659,12 @@ <h2>
<dt id="VERSION-constant" class="">VERSION =

</dt>
<dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>1.1.0</span><span class='tstring_end'>&#39;</span></span></pre></dd>
<dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>1.1.1</span><span class='tstring_end'>&#39;</span></span></pre></dd>

<dt id="EDGE_VERSION-constant" class="">EDGE_VERSION =

</dt>
<dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>0.4.0</span><span class='tstring_end'>&#39;</span></span></pre></dd>
<dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>0.4.1</span><span class='tstring_end'>&#39;</span></span></pre></dd>

<dt id="NULL_LOGGER-constant" class="">NULL_LOGGER =
<div class="docstring">
Expand Down
13 changes: 13 additions & 0 deletions docs/master/file.CHANGELOG.html
Expand Up @@ -59,6 +59,18 @@

<div id="content"><div id='filecontents'><h2>Current</h2>

<h2>Release v1.1.1, edge v0.4.1 (1 Nov 2018)</h2>

<ul>
<li>(#768) add support for 1.9.3 back </li>
</ul>

<h2>Release v1.1.0, edge v0.4.0 (31 OCt 2018) (yanked)</h2>

<ul>
<li>(#768) yanked because of issues with removed 1.9.3 support </li>
</ul>

<h2>Release v1.1.0.pre2, edge v0.4.0.pre2 (18 Sep 2018)</h2>

<p>concurrent-ruby:</p>
Expand All @@ -80,6 +92,7 @@ <h2>Release v1.1.0.pre1, edge v0.4.0.pre1 (15 Aug 2018)</h2>
<p>concurrent-ruby:</p>

<ul>
<li>requires at least Ruby 2.0</li>
<li><a href="http://ruby-concurrency.github.io/concurrent-ruby/1.1.0/Concurrent/Promises.html">Promises</a>
are moved from <code>concurrent-ruby-edge</code> to <code>concurrent-ruby</code></li>
<li>Add support for TruffleRuby
Expand Down
10 changes: 8 additions & 2 deletions docs/master/file.README.html
Expand Up @@ -313,8 +313,14 @@ <h3>Edge Features</h3>

<h2>Supported Ruby versions</h2>

<p>MRI 2.0 and above, JRuby 9000, TruffleRuby are supported.
This gem should be fully compatible with any interpreter that is compliant with Ruby 2.0 or newer.
<ul>
<li>MRI 2.0 and above</li>
<li>JRuby 9000</li>
<li>TruffleRuby are supported. </li>
<li>Any Ruby interpreter that is compliant with Ruby 2.0 or newer.</li>
</ul>

<p>Actually we still support mri 1.9.3 and jruby 1.7.27 but we are looking at ways how to drop the support.
Java 8 is preferred for JRuby but every Java version on which JRuby 9000 runs is supported.</p>

<p>The legacy support for Rubinius is kept but it is no longer maintained, if you would like to help
Expand Down

0 comments on commit 737a822

Please sign in to comment.