Skip to content

Commit 00d8328

Browse files
pitr-chpitr-ch
committed
version bump
1 parent ad9081a commit 00d8328

File tree

15 files changed

+2526
-1921
lines changed

15 files changed

+2526
-1921
lines changed

‎Rakefile

Lines changed: 44 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,29 @@ edge_gemspec = Gem::Specification.load File.join(__dir__, 'concurrent-ruby-edge.
99

1010
require 'rake/javaextensiontask'
1111

12-
Rake::JavaExtensionTask.new('concurrent_ruby', core_gemspec) do |ext|
12+
JRUBY_JAR_PATH = '/usr/local/opt/rbenv/versions/jruby-9.1.17.0/lib/jruby.jar'
13+
14+
class ConcurrentRubyJavaExtensionTask < Rake::JavaExtensionTask
15+
def java_classpath_arg(*args)
16+
jruby_cpath = nil
17+
if RUBY_PLATFORM =~ /java/
18+
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)
21+
jruby_cpath = cpath.compact.join(File::PATH_SEPARATOR)
22+
rescue => e
23+
end
24+
end
25+
unless jruby_cpath
26+
jruby_cpath = JRUBY_JAR_PATH
27+
raise "#{jruby_cpath} does not exist" unless File.exist? jruby_cpath
28+
end
29+
jruby_cpath += File::PATH_SEPARATOR + args.join(File::PATH_SEPARATOR) unless args.empty?
30+
jruby_cpath ? "-cp \"#{jruby_cpath}\"" : ""
31+
end
32+
end
33+
34+
ConcurrentRubyJavaExtensionTask.new('concurrent_ruby', core_gemspec) do |ext|
1335
ext.ext_dir = 'ext/concurrent-ruby'
1436
ext.lib_dir = 'lib/concurrent'
1537
end
@@ -203,14 +225,25 @@ namespace :release do
203225

204226
task :checks => "yard:#{current_yard_version_name}:uptodate" do
205227
Dir.chdir(__dir__) do
206-
begin
207-
STDOUT.puts "Is this a final release build? (Do git checks?) (y/n)"
208-
input = STDIN.gets.strip.downcase
209-
end until %w(y n).include?(input)
210-
if input == 'y'
211-
sh 'test -z "$(git status --porcelain)"'
212-
sh 'git fetch'
213-
sh 'test $(git show-ref --verify --hash refs/heads/master) = $(git show-ref --verify --hash refs/remotes/github/master)'
228+
sh 'test -z "$(git status --porcelain)"' do |ok, res|
229+
unless ok
230+
begin
231+
STDOUT.puts 'Command failed. Continue? (y/n)'
232+
input = STDIN.gets.strip.downcase
233+
end until %w(y n).include?(input)
234+
exit 1 if input == 'n'
235+
end
236+
end
237+
sh 'git fetch'
238+
sh 'test $(git show-ref --verify --hash refs/heads/master) = ' +
239+
'$(git show-ref --verify --hash refs/remotes/github/master)' do |ok, res|
240+
unless ok
241+
begin
242+
STDOUT.puts 'Command failed. Continue? (y/n)'
243+
input = STDIN.gets.strip.downcase
244+
end until %w(y n).include?(input)
245+
exit 1 if input == 'n'
246+
end
214247
end
215248
end
216249
end
@@ -243,10 +276,10 @@ namespace :release do
243276
namespace :publish do
244277
task :ask do
245278
begin
246-
STDOUT.puts "Do you want to publish? (y/n)"
279+
STDOUT.puts 'Do you want to publish? (y/n)'
247280
input = STDIN.gets.strip.downcase
248281
end until %w(y n).include?(input)
249-
raise 'reconsidered' if input == 'n'
282+
exit 1 if input == 'n'
250283
end
251284

252285
desc '** tag HEAD with current version and push to github'

‎docs-source/signpost.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
Pick a version:
44

55
* [master](./master/index.html)
6-
* [1.1.0.pre2](./1.1.0/index.html)
6+
* [1.1.0](./1.1.0/index.html)
77
* [1.0.5](./1.0.5/index.html)

‎docs/1.1.0/Concurrent.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -653,12 +653,12 @@ <h2>
653653
<dt id="VERSION-constant" class="">VERSION =
654654

655655
</dt>
656-
<dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>1.1.0.pre2</span><span class='tstring_end'>&#39;</span></span></pre></dd>
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>
657657

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

660660
</dt>
661-
<dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>0.4.0.pre2</span><span class='tstring_end'>&#39;</span></span></pre></dd>
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>
662662

663663
<dt id="NULL_LOGGER-constant" class="">NULL_LOGGER =
664664
<div class="docstring">

‎docs/1.1.0/Concurrent/AtomicReference.html

Lines changed: 84 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -429,18 +429,18 @@ <h3 class="signature first" id="initialize-instance_method">
429429
<pre class="lines">
430430

431431

432-
185
433-
186
434-
187
435-
188
436-
189
437-
190
438-
191
439-
192
440-
193</pre>
432+
195
433+
196
434+
197
435+
198
436+
199
437+
200
438+
201
439+
202
440+
203</pre>
441441
</td>
442442
<td>
443-
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 185</span>
443+
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 195</span>
444444

445445
<span class='kw'>class</span> <span class='const'><span class='object_link'><a href="" title="Concurrent::AtomicReference (class)">AtomicReference</a></span></span> <span class='op'>&lt;</span> <span class='const'>AtomicReferenceImplementation</span>
446446

@@ -542,18 +542,18 @@ <h3 class="signature first" id="compare_and_set-instance_method">
542542
<pre class="lines">
543543

544544

545-
185
546-
186
547-
187
548-
188
549-
189
550-
190
551-
191
552-
192
553-
193</pre>
545+
195
546+
196
547+
197
548+
198
549+
199
550+
200
551+
201
552+
202
553+
203</pre>
554554
</td>
555555
<td>
556-
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 185</span>
556+
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 195</span>
557557

558558
<span class='kw'>class</span> <span class='const'><span class='object_link'><a href="" title="Concurrent::AtomicReference (class)">AtomicReference</a></span></span> <span class='op'>&lt;</span> <span class='const'>AtomicReferenceImplementation</span>
559559

@@ -611,18 +611,18 @@ <h3 class="signature " id="get-instance_method">
611611
<pre class="lines">
612612

613613

614-
185
615-
186
616-
187
617-
188
618-
189
619-
190
620-
191
621-
192
622-
193</pre>
614+
195
615+
196
616+
197
617+
198
618+
199
619+
200
620+
201
621+
202
622+
203</pre>
623623
</td>
624624
<td>
625-
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 185</span>
625+
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 195</span>
626626

627627
<span class='kw'>class</span> <span class='const'><span class='object_link'><a href="" title="Concurrent::AtomicReference (class)">AtomicReference</a></span></span> <span class='op'>&lt;</span> <span class='const'>AtomicReferenceImplementation</span>
628628

@@ -699,18 +699,18 @@ <h3 class="signature " id="get_and_set-instance_method">
699699
<pre class="lines">
700700

701701

702-
185
703-
186
704-
187
705-
188
706-
189
707-
190
708-
191
709-
192
710-
193</pre>
702+
195
703+
196
704+
197
705+
198
706+
199
707+
200
708+
201
709+
202
710+
203</pre>
711711
</td>
712712
<td>
713-
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 185</span>
713+
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 195</span>
714714

715715
<span class='kw'>class</span> <span class='const'><span class='object_link'><a href="" title="Concurrent::AtomicReference (class)">AtomicReference</a></span></span> <span class='op'>&lt;</span> <span class='const'>AtomicReferenceImplementation</span>
716716

@@ -787,18 +787,18 @@ <h3 class="signature " id="set-instance_method">
787787
<pre class="lines">
788788

789789

790-
185
791-
186
792-
187
793-
188
794-
189
795-
190
796-
191
797-
192
798-
193</pre>
790+
195
791+
196
792+
197
793+
198
794+
199
795+
200
796+
201
797+
202
798+
203</pre>
799799
</td>
800800
<td>
801-
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 185</span>
801+
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 195</span>
802802

803803
<span class='kw'>class</span> <span class='const'><span class='object_link'><a href="" title="Concurrent::AtomicReference (class)">AtomicReference</a></span></span> <span class='op'>&lt;</span> <span class='const'>AtomicReferenceImplementation</span>
804804

@@ -860,12 +860,12 @@ <h3 class="signature " id="to_s-instance_method">
860860
<pre class="lines">
861861

862862

863-
188
864-
189
865-
190</pre>
863+
198
864+
199
865+
200</pre>
866866
</td>
867867
<td>
868-
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 188</span>
868+
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 198</span>
869869

870870
<span class='kw'>def</span> <span class='id identifier rubyid_to_s'>to_s</span>
871871
<span class='id identifier rubyid_format'>format</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>%s value:%s&gt;</span><span class='tstring_end'>&#39;</span></span><span class='comma'>,</span> <span class='kw'>super</span><span class='lbracket'>[</span><span class='int'>0</span><span class='op'>..</span><span class='op'>-</span><span class='int'>2</span><span class='rbracket'>]</span><span class='comma'>,</span> <span class='id identifier rubyid_get'>get</span>
@@ -964,18 +964,18 @@ <h3 class="signature " id="try_update-instance_method">
964964
<pre class="lines">
965965

966966

967-
185
968-
186
969-
187
970-
188
971-
189
972-
190
973-
191
974-
192
975-
193</pre>
967+
195
968+
196
969+
197
970+
198
971+
199
972+
200
973+
201
974+
202
975+
203</pre>
976976
</td>
977977
<td>
978-
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 185</span>
978+
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 195</span>
979979

980980
<span class='kw'>class</span> <span class='const'><span class='object_link'><a href="" title="Concurrent::AtomicReference (class)">AtomicReference</a></span></span> <span class='op'>&lt;</span> <span class='const'>AtomicReferenceImplementation</span>
981981

@@ -1099,18 +1099,18 @@ <h3 class="signature " id="try_update!-instance_method">
10991099
<pre class="lines">
11001100

11011101

1102-
185
1103-
186
1104-
187
1105-
188
1106-
189
1107-
190
1108-
191
1109-
192
1110-
193</pre>
1102+
195
1103+
196
1104+
197
1105+
198
1106+
199
1107+
200
1108+
201
1109+
202
1110+
203</pre>
11111111
</td>
11121112
<td>
1113-
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 185</span>
1113+
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 195</span>
11141114

11151115
<span class='kw'>class</span> <span class='const'><span class='object_link'><a href="" title="Concurrent::AtomicReference (class)">AtomicReference</a></span></span> <span class='op'>&lt;</span> <span class='const'>AtomicReferenceImplementation</span>
11161116

@@ -1207,18 +1207,18 @@ <h3 class="signature " id="update-instance_method">
12071207
<pre class="lines">
12081208

12091209

1210-
185
1211-
186
1212-
187
1213-
188
1214-
189
1215-
190
1216-
191
1217-
192
1218-
193</pre>
1210+
195
1211+
196
1212+
197
1213+
198
1214+
199
1215+
200
1216+
201
1217+
202
1218+
203</pre>
12191219
</td>
12201220
<td>
1221-
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 185</span>
1221+
<pre class="code"><span class="info file"># File 'lib/concurrent/atomic/atomic_reference.rb', line 195</span>
12221222

12231223
<span class='kw'>class</span> <span class='const'><span class='object_link'><a href="" title="Concurrent::AtomicReference (class)">AtomicReference</a></span></span> <span class='op'>&lt;</span> <span class='const'>AtomicReferenceImplementation</span>
12241224

0 commit comments

Comments
 (0)