Skip to content

Commit 8822d07

Browse files
committed
Updating nokogiri and other dependencies
Also updating travis build version before it goes unsupported. Using ruby version 2.4.2
1 parent 9073f06 commit 8822d07

File tree

3 files changed

+59
-52
lines changed

3 files changed

+59
-52
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.3
1+
2.4.2

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
sudo: false
1+
sudo: required
2+
dist: trusty
23

34
before_install:
45
- export NOKOGIRI_USE_SYSTEM_LIBRARIES=true
@@ -14,10 +15,9 @@ script:
1415
# environment
1516
language: ruby
1617
rvm:
17-
- "2.2.3"
18+
- 2.4.2
1819
jdk:
1920
- oraclejdk8
20-
dist: precise
2121

2222
before_deploy: if [[ ${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH} != master ]]; then
2323
bundle exec jekyll clean && bundle exec jekyll build --baseurl /api/${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH};

Gemfile.lock

Lines changed: 55 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,45 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (5.0.2)
4+
activesupport (5.1.4)
55
concurrent-ruby (~> 1.0, >= 1.0.2)
66
i18n (~> 0.7)
77
minitest (~> 5.1)
88
tzinfo (~> 1.1)
9-
addressable (2.5.1)
10-
public_suffix (~> 2.0, >= 2.0.2)
11-
airbrussh (1.1.2)
9+
addressable (2.5.2)
10+
public_suffix (>= 2.0.2, < 4.0)
11+
airbrussh (1.3.0)
1212
sshkit (>= 1.6.1, != 1.7.0)
13-
capistrano (3.8.0)
13+
capistrano (3.10.1)
1414
airbrussh (>= 1.0.0)
1515
i18n
1616
rake (>= 10.0.0)
1717
sshkit (>= 1.9.0)
18-
capistrano-bundler (1.2.0)
18+
capistrano-bundler (1.3.0)
1919
capistrano (~> 3.1)
2020
sshkit (~> 1.2)
2121
capistrano-rvm (0.1.2)
2222
capistrano (~> 3.0)
2323
sshkit (~> 1.2)
2424
colorator (1.1.0)
25-
colored (1.2)
25+
colorize (0.8.1)
2626
concurrent-ruby (1.0.5)
2727
diff-lcs (1.3)
28-
ethon (0.10.1)
28+
ethon (0.11.0)
2929
ffi (>= 1.3.0)
3030
ffi (1.9.18)
3131
forwardable-extended (2.6.0)
32-
html-proofer (3.6.0)
32+
html-proofer (3.8.0)
3333
activesupport (>= 4.2, < 6.0)
3434
addressable (~> 2.3)
35-
colored (~> 1.2)
35+
colorize (~> 0.8)
3636
mercenary (~> 0.3.2)
37-
nokogiri (~> 1.5)
37+
nokogiri (~> 1.8.1)
3838
parallel (~> 1.3)
39-
typhoeus (~> 0.7)
39+
typhoeus (~> 1.3)
4040
yell (~> 2.0)
41-
i18n (0.8.1)
41+
i18n (0.9.3)
42+
concurrent-ruby (~> 1.0)
4243
jekyll (3.4.3)
4344
addressable (~> 2.4)
4445
colorator (~> 1.0)
@@ -50,58 +51,64 @@ GEM
5051
pathutil (~> 0.9)
5152
rouge (~> 1.7)
5253
safe_yaml (~> 1.0)
53-
jekyll-redirect-from (0.12.1)
54+
jekyll-redirect-from (0.13.0)
5455
jekyll (~> 3.3)
55-
jekyll-sass-converter (1.5.0)
56+
jekyll-sass-converter (1.5.1)
5657
sass (~> 3.4)
57-
jekyll-sitemap (1.0.0)
58+
jekyll-sitemap (1.1.1)
5859
jekyll (~> 3.3)
59-
jekyll-watch (1.5.0)
60-
listen (~> 3.0, < 3.1)
60+
jekyll-watch (1.5.1)
61+
listen (~> 3.0)
6162
kramdown (1.12.0)
6263
liquid (3.0.6)
63-
listen (3.0.8)
64+
listen (3.1.5)
6465
rb-fsevent (~> 0.9, >= 0.9.4)
6566
rb-inotify (~> 0.9, >= 0.9.7)
67+
ruby_dep (~> 1.2)
6668
mercenary (0.3.6)
67-
mini_portile2 (2.1.0)
68-
minitest (5.10.1)
69+
mini_portile2 (2.3.0)
70+
minitest (5.11.1)
6971
net-scp (1.2.1)
7072
net-ssh (>= 2.6.5)
71-
net-ssh (4.1.0)
72-
nokogiri (1.7.1)
73-
mini_portile2 (~> 2.1.0)
74-
parallel (1.11.1)
75-
pathutil (0.14.0)
73+
net-ssh (4.2.0)
74+
nokogiri (1.8.1)
75+
mini_portile2 (~> 2.3.0)
76+
parallel (1.12.1)
77+
pathutil (0.16.1)
7678
forwardable-extended (~> 2.6)
77-
public_suffix (2.0.5)
78-
rake (12.0.0)
79-
rb-fsevent (0.9.8)
80-
rb-inotify (0.9.8)
81-
ffi (>= 0.5.0)
79+
public_suffix (3.0.1)
80+
rake (12.3.0)
81+
rb-fsevent (0.10.2)
82+
rb-inotify (0.9.10)
83+
ffi (>= 0.5.0, < 2)
8284
rouge (1.11.1)
83-
rspec (3.5.0)
84-
rspec-core (~> 3.5.0)
85-
rspec-expectations (~> 3.5.0)
86-
rspec-mocks (~> 3.5.0)
87-
rspec-core (3.5.4)
88-
rspec-support (~> 3.5.0)
89-
rspec-expectations (3.5.0)
85+
rspec (3.7.0)
86+
rspec-core (~> 3.7.0)
87+
rspec-expectations (~> 3.7.0)
88+
rspec-mocks (~> 3.7.0)
89+
rspec-core (3.7.1)
90+
rspec-support (~> 3.7.0)
91+
rspec-expectations (3.7.0)
9092
diff-lcs (>= 1.2.0, < 2.0)
91-
rspec-support (~> 3.5.0)
92-
rspec-mocks (3.5.0)
93+
rspec-support (~> 3.7.0)
94+
rspec-mocks (3.7.0)
9395
diff-lcs (>= 1.2.0, < 2.0)
94-
rspec-support (~> 3.5.0)
95-
rspec-support (3.5.0)
96+
rspec-support (~> 3.7.0)
97+
rspec-support (3.7.0)
98+
ruby_dep (1.5.0)
9699
safe_yaml (1.0.4)
97-
sass (3.4.23)
98-
sshkit (1.13.1)
100+
sass (3.5.5)
101+
sass-listen (~> 4.0.0)
102+
sass-listen (4.0.0)
103+
rb-fsevent (~> 0.9, >= 0.9.4)
104+
rb-inotify (~> 0.9, >= 0.9.7)
105+
sshkit (1.15.1)
99106
net-scp (>= 1.1.2)
100107
net-ssh (>= 2.8.0)
101108
thread_safe (0.3.6)
102-
typhoeus (0.8.0)
103-
ethon (>= 0.8.0)
104-
tzinfo (1.2.3)
109+
typhoeus (1.3.0)
110+
ethon (>= 0.9.0)
111+
tzinfo (1.2.4)
105112
thread_safe (~> 0.1)
106113
yell (2.0.7)
107114

@@ -121,4 +128,4 @@ DEPENDENCIES
121128
rspec
122129

123130
BUNDLED WITH
124-
1.15.3
131+
1.16.1

0 commit comments

Comments
 (0)