Skip to content

Commit b963476

Browse files
committed
Lock timecop to a version that can install on 1.8.7.
1 parent fa8fa42 commit b963476

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

Gemfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@ gem 'faraday', '>= 0.8'
3737
gem 'httpclient', '>= 2.2'
3838
gem 'excon', '>= 0.22'
3939

40-
gem 'timecop', '>= 0.3.5'
40+
# 0.6.2 cannot install on 1.8.7:
41+
# https://github.com/travisjeffery/timecop/commit/cec7352a6655cceb0216db53eea630354ee63e3f
42+
gem 'timecop', '0.6.1'
43+
4144
gem 'rack', '>= 1.3.6'
4245
gem 'sinatra', '>= 1.3.2'
4346
gem 'multi_json', '>= 1.0.3'

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ GEM
118118
tilt (~> 1.3, >= 1.3.4)
119119
slop (3.4.6)
120120
tilt (1.4.1)
121-
timecop (0.6.3)
121+
timecop (0.6.1)
122122
typhoeus (0.6.5)
123123
ethon (~> 0.6.1)
124124
webmock (1.13.0)
@@ -158,7 +158,7 @@ DEPENDENCIES
158158
ruby-debug
159159
simplecov (>= 0.5.3)
160160
sinatra (>= 1.3.2)
161-
timecop (>= 0.3.5)
161+
timecop (= 0.6.1)
162162
typhoeus (>= 0.6)
163163
vcr!
164164
webmock (>= 1.13)

gemfiles/typhoeus_old.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ gem "fakeweb", ">= 1.3.0"
1818
gem "faraday", ">= 0.8"
1919
gem "httpclient", ">= 2.2"
2020
gem "excon", ">= 0.22"
21-
gem "timecop", ">= 0.3.5"
21+
gem "timecop", "0.6.1"
2222
gem "rack", ">= 1.3.6"
2323
gem "sinatra", ">= 1.3.2"
2424
gem "multi_json", ">= 1.0.3"

gemfiles/typhoeus_old.gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ GEM
9393
rack-protection (~> 1.4)
9494
tilt (~> 1.3, >= 1.3.4)
9595
tilt (1.4.1)
96-
timecop (0.6.3)
96+
timecop (0.6.1)
9797
typhoeus (0.4.2)
9898
ffi (~> 1.0)
9999
mime-types (~> 1.18)
@@ -131,7 +131,7 @@ DEPENDENCIES
131131
rspec (>= 2.11)
132132
simplecov (>= 0.5.3)
133133
sinatra (>= 1.3.2)
134-
timecop (>= 0.3.5)
134+
timecop (= 0.6.1)
135135
typhoeus (~> 0.4.2)
136136
vcr!
137137
webmock (= 1.8.11)

0 commit comments

Comments
 (0)