Skip to content

Commit c52563d

Browse files
committed
Update warbler fixture to 2.1.0 for JRuby 10.1
warbler 2.0.5 (from the github pull/557 pin) does not work on JRuby 10.1: it cannot require the now-bundled ostruct, and even after that hurdle Monitor#synchronize raises ArgumentError under the warble jar build. warbler 2.1.0 explicitly supports JRuby 10.1 and pulls ostruct in itself, so switch the fixture over to the gem release.
1 parent 949cf8c commit c52563d

2 files changed

Lines changed: 12 additions & 16 deletions

File tree

spec/realworld/fixtures/warbler/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ source "https://rubygems.org"
44

55
gem "demo", path: "./demo"
66
gem "jruby-jars", "~> 10.0"
7-
gem "warbler", github: "https://github.com/jruby/warbler/pull/557"
7+
gem "warbler", "~> 2.1"
Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
GIT
2-
remote: https://github.com/jruby/warbler.git
3-
revision: 3a3a89e9a055ab1badb4e6fee860e8617b4acfe1
4-
ref: refs/pull/557/head
5-
specs:
6-
warbler (2.0.5)
7-
jruby-jars (>= 9.0.0)
8-
jruby-rack (>= 1.1.1, < 1.3)
9-
rake (>= 13.0.3)
10-
rexml (~> 3.0)
11-
rubyzip (>= 1.0.0)
12-
131
PATH
142
remote: demo
153
specs:
@@ -19,10 +7,18 @@ GEM
197
remote: https://rubygems.org/
208
specs:
219
jruby-jars (10.0.0.1)
22-
jruby-rack (1.2.2)
10+
jruby-rack (1.2.7)
11+
ostruct (0.6.3)
2312
rake (13.3.0)
2413
rexml (3.4.2)
25-
rubyzip (2.4.1)
14+
rubyzip (3.3.0)
15+
warbler (2.1.0)
16+
jruby-jars (>= 9.4, < 10.1)
17+
jruby-rack (>= 1.2.3, < 1.3)
18+
ostruct (~> 0.6.2)
19+
rake (~> 13.0, >= 13.0.3)
20+
rexml (~> 3.0)
21+
rubyzip (>= 3.0.0)
2622

2723
PLATFORMS
2824
arm64-darwin
@@ -33,7 +29,7 @@ PLATFORMS
3329
DEPENDENCIES
3430
demo!
3531
jruby-jars (~> 10.0)
36-
warbler!
32+
warbler (~> 2.1)
3733

3834
BUNDLED WITH
3935
4.1.0.dev

0 commit comments

Comments
 (0)