Skip to content

Commit b64745f

Browse files
committed
[chore] Partially resurrect camping example with modern (unreleased) warbler
(cherry picked from commit 886b849)
1 parent 61c1b37 commit b64745f

File tree

2 files changed

+47
-10
lines changed

2 files changed

+47
-10
lines changed

examples/camping/Gemfile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
source 'https://rubygems.org'
22

3-
gem 'rack'
4-
gem 'camping'
3+
gem 'rack', '~> 2.2'
4+
gem 'rackup'
5+
gem 'camping', '< 3'
56
gem 'markaby'
7+
8+
group :development do
9+
gem 'warbler', github: 'jruby/warbler', branch: 'master'
10+
gem 'jruby-jars', '< 10'
11+
end

examples/camping/Gemfile.lock

Lines changed: 39 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,48 @@
1+
GIT
2+
remote: https://github.com/jruby/warbler.git
3+
revision: f10ed60aefe3bf498917bfd18de780fb7d240f65
4+
branch: master
5+
specs:
6+
warbler (2.0.5)
7+
jruby-jars (>= 9.0.0)
8+
jruby-rack (>= 1.1.1, < 1.3)
9+
ostruct (= 0.6.2)
10+
rake (>= 13.0.3)
11+
rexml (~> 3.0)
12+
rubyzip (>= 1.0.0)
13+
114
GEM
2-
remote: http://rubygems.org/
15+
remote: https://rubygems.org/
316
specs:
4-
builder (3.0.0)
5-
camping (2.1)
17+
builder (3.3.0)
18+
camping (2.1.532)
19+
mab (>= 0.0.3)
620
rack (>= 1.0)
7-
markaby (0.7.1)
8-
builder (>= 2.0.0)
9-
rack (1.2.1)
21+
jruby-jars (9.4.13.0)
22+
jruby-rack (1.2.3)
23+
mab (0.0.3)
24+
markaby (0.9.4)
25+
builder
26+
ostruct (0.6.2)
27+
rack (2.2.17)
28+
rackup (1.0.1)
29+
rack (< 3)
30+
webrick
31+
rake (13.3.0)
32+
rexml (3.4.1)
33+
rubyzip (2.4.1)
34+
webrick (1.9.1)
1035

1136
PLATFORMS
1237
java
1338

1439
DEPENDENCIES
15-
camping
40+
camping (< 3)
41+
jruby-jars (< 10)
1642
markaby
17-
rack
43+
rack (~> 2.2)
44+
rackup
45+
warbler!
46+
47+
BUNDLED WITH
48+
2.6.9

0 commit comments

Comments
 (0)