Upgrade ffi to 1.9.4, and remove platform conditionals.
Specifying a released version of a gem as requirement wouldn't hurt
other platforms.
Akinori MUSHA
2 fichiers modifiés avec 6 ajouts et 15 suppressions
+ 3
- 14
Gemfile
@@ -95,20 +95,9 @@ group :production do |
||
| 95 | 95 |
gem 'rack' |
| 96 | 96 |
end |
| 97 | 97 |
|
| 98 |
-case RUBY_PLATFORM |
|
| 99 |
- when /freebsd|netbsd|openbsd/ |
|
| 100 |
- # ffi (required by typhoeus via ethon) merged fixes for bugs fatal |
|
| 101 |
- # on these platforms after 1.9.3; no following release as yet. |
|
| 102 |
- gem 'ffi', github: 'ffi/ffi', branch: 'master' |
|
| 103 |
- |
|
| 104 |
- # tzinfo 1.2.0 has added support for reading zoneinfo on these |
|
| 105 |
- # platforms. |
|
| 106 |
- gem 'tzinfo', '>= 1.2.0' |
|
| 107 |
- when /solaris/ |
|
| 108 |
- # ditto |
|
| 109 |
- gem 'tzinfo', '>= 1.2.0' |
|
| 110 |
-end |
|
| 111 |
- |
|
| 98 |
+# Platform requirements. |
|
| 99 |
+gem 'ffi', '>= 1.9.4' # required by typhoeus; 1.9.4 has fixes for *BSD. |
|
| 100 |
+gem 'tzinfo', '>= 1.2.0' # required by rails; 1.2.0 has support for *BSD and Solaris. |
|
| 112 | 101 |
# Windows does not have zoneinfo files, so bundle the tzinfo-data gem. |
| 113 | 102 |
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw] |
| 114 | 103 |
|
+ 3
- 1
Gemfile.lock
@@ -119,7 +119,7 @@ GEM |
||
| 119 | 119 |
feed-normalizer (1.5.2) |
| 120 | 120 |
hpricot (>= 0.6) |
| 121 | 121 |
simple-rss (>= 1.1) |
| 122 |
- ffi (1.9.3) |
|
| 122 |
+ ffi (1.9.4) |
|
| 123 | 123 |
forecast_io (2.0.0) |
| 124 | 124 |
faraday |
| 125 | 125 |
hashie |
@@ -407,6 +407,7 @@ DEPENDENCIES |
||
| 407 | 407 |
faraday (~> 0.9.0) |
| 408 | 408 |
faraday_middleware |
| 409 | 409 |
feed-normalizer |
| 410 |
+ ffi (>= 1.9.4) |
|
| 410 | 411 |
forecast_io (~> 2.0.0) |
| 411 | 412 |
foreman (~> 0.63.0) |
| 412 | 413 |
geokit (~> 1.8.4) |
@@ -453,6 +454,7 @@ DEPENDENCIES |
||
| 453 | 454 |
twilio-ruby (~> 3.11.5) |
| 454 | 455 |
twitter (~> 5.8.0) |
| 455 | 456 |
typhoeus (~> 0.6.3) |
| 457 |
+ tzinfo (>= 1.2.0) |
|
| 456 | 458 |
tzinfo-data |
| 457 | 459 |
uglifier (>= 1.3.0) |
| 458 | 460 |
unicorn |