Skip to content

Commit 3b3f9bf

Browse files
committed
Put 1.9.3 support back
1 parent ea7877d commit 3b3f9bf

File tree

191 files changed

+200
-93
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

191 files changed

+200
-93
lines changed

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,18 @@ matrix:
3636
rvm: 2.1.10
3737
- name: MRI 2.0.0
3838
rvm: 2.0.0
39+
- name: MRI 1.9.3
40+
rvm: 1.9.3
3941

4042
- name: JRuby 9.1.17.0
4143
rvm: jruby-9.1.17.0
4244
jdk: oraclejdk8
4345
- name: JRuby 9.0.5.0
4446
rvm: jruby-9.0.5.0
4547
jdk: oraclejdk8
48+
- name: JRuby 1.7.27
49+
rvm: jruby-1.7.27
50+
jdk: oraclejdk8
4651

4752
- name: MRI head
4853
rvm: ruby-head

CHANGELOG.md

Lines changed: 8 additions & 0 deletions

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://rubygems.org'
22

3-
require_relative 'lib/concurrent/version'
3+
require File.join(File.dirname(__FILE__ ), 'lib/concurrent/version')
44

55
no_path = ENV['NO_PATH']
66
options = no_path ? {} : { path: '.' }

README.md

Lines changed: 6 additions & 2 deletions

Rakefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
require_relative 'lib/concurrent/version'
44
require_relative 'lib/concurrent/utility/engine'
5+
require_relative 'lib/concurrent/utility/193'
56

67
core_gemspec = Gem::Specification.load File.join(__dir__, 'concurrent-ruby.gemspec')
78
ext_gemspec = Gem::Specification.load File.join(__dir__, 'concurrent-ruby-ext.gemspec')
@@ -16,8 +17,8 @@ class ConcurrentRubyJavaExtensionTask < Rake::JavaExtensionTask
1617
jruby_cpath = nil
1718
if RUBY_PLATFORM =~ /java/
1819
begin
19-
cpath = Java::java.lang.System.getProperty('java.class.path').split(File::PATH_SEPARATOR)
20-
cpath += Java::java.lang.System.getProperty('sun.boot.class.path').split(File::PATH_SEPARATOR)
20+
cpath = Java::java.lang.System.getProperty('java.class.path').split(File::PATH_SEPARATOR)
21+
cpath += Java::java.lang.System.getProperty('sun.boot.class.path').split(File::PATH_SEPARATOR)
2122
jruby_cpath = cpath.compact.join(File::PATH_SEPARATOR)
2223
rescue => e
2324
end

concurrent-ruby-edge.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require_relative 'lib/concurrent/version'
1+
require File.join(File.dirname(__FILE__ ), 'lib/concurrent/version')
22

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

25-
s.required_ruby_version = '>= 2.0.0'
25+
s.required_ruby_version = '>= 1.9.3'
2626

2727
s.add_runtime_dependency 'concurrent-ruby', "~> #{Concurrent::VERSION}"
2828
end

concurrent-ruby-ext.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require_relative 'lib/concurrent/version'
1+
require File.join(File.dirname(__FILE__ ), 'lib/concurrent/version')
22

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

24-
s.required_ruby_version = '>= 2.0.0'
24+
s.required_ruby_version = '>= 1.9.3'
2525

2626
s.add_runtime_dependency 'concurrent-ruby', "= #{Concurrent::VERSION}"
2727
end

concurrent-ruby.gemspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
require_relative 'lib/concurrent/version'
2-
require_relative 'lib/concurrent/utility/engine'
1+
require File.join(File.dirname(__FILE__ ), 'lib/concurrent/version')
2+
require File.join(File.dirname(__FILE__ ), 'lib/concurrent/utility/engine')
33

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

28-
s.required_ruby_version = '>= 2.0.0'
28+
s.required_ruby_version = '>= 1.9.3'
2929
end

docs-source/signpost.md

Lines changed: 1 addition & 1 deletion

docs/1.1.0/Concurrent.html renamed to docs/1.1.1/Concurrent.html

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,14 @@ <h3>Edge Features</h3>
343343

344344
<h2>Supported Ruby versions</h2>
345345

346-
<p>MRI 2.0 and above, JRuby 9000, TruffleRuby are supported.
347-
This gem should be fully compatible with any interpreter that is compliant with Ruby 2.0 or newer.
346+
<ul>
347+
<li>MRI 2.0 and above</li>
348+
<li>JRuby 9000</li>
349+
<li>TruffleRuby are supported. </li>
350+
<li>Any Ruby interpreter that is compliant with Ruby 2.0 or newer.</li>
351+
</ul>
352+
353+
<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.
348354
Java 8 is preferred for JRuby but every Java version on which JRuby 9000 runs is supported.</p>
349355

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

655661
</dt>
656-
<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>
662+
<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>
657663

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

660666
</dt>
661-
<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>
667+
<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>
662668

663669
<dt id="NULL_LOGGER-constant" class="">NULL_LOGGER =
664670
<div class="docstring">

0 commit comments

Comments
 (0)