Browse files

Force a version of geo kit < 1.6.5 b/c multi_json 1.6 conflicts w/ da…

…ta_mapper
  • Loading branch information...
1 parent 9452dab commit a5ed98fa55669b1f0f418fb63cd394a83d07f7b9 @dkelly dkelly committed Apr 9, 2012
Showing with 48 additions and 6 deletions.
  1. +2 −2 Gemfile
  2. +46 −4 Gemfile.lock
View
4 Gemfile
@@ -1,8 +1,8 @@
source 'http://rubygems.org'
-#gem 'data_mapper'
+gem 'data_mapper'
gem 'dm-postgres-adapter'
gem 'faraday'
-gem 'geokit'
+gem 'geokit', "< 1.6.5"
gem 'nokogiri'
gem 'rdiscount'
gem 'sinatra'
View
50 Gemfile.lock
@@ -2,25 +2,64 @@ GEM
remote: http://rubygems.org/
specs:
addressable (2.2.7)
+ bcrypt-ruby (3.0.1)
+ data_mapper (1.2.0)
+ dm-aggregates (~> 1.2.0)
+ dm-constraints (~> 1.2.0)
+ dm-core (~> 1.2.0)
+ dm-migrations (~> 1.2.0)
+ dm-serializer (~> 1.2.0)
+ dm-timestamps (~> 1.2.0)
+ dm-transactions (~> 1.2.0)
+ dm-types (~> 1.2.0)
+ dm-validations (~> 1.2.0)
data_objects (0.10.8)
addressable (~> 2.1)
+ dm-aggregates (1.2.0)
+ dm-core (~> 1.2.0)
+ dm-constraints (1.2.0)
+ dm-core (~> 1.2.0)
dm-core (1.2.0)
addressable (~> 2.2.6)
dm-do-adapter (1.2.0)
data_objects (~> 0.10.6)
dm-core (~> 1.2.0)
+ dm-migrations (1.2.0)
+ dm-core (~> 1.2.0)
dm-postgres-adapter (1.2.0)
dm-do-adapter (~> 1.2.0)
do_postgres (~> 0.10.6)
+ dm-serializer (1.2.1)
+ dm-core (~> 1.2.0)
+ fastercsv (~> 1.5.4)
+ json (~> 1.6.1)
+ json_pure (~> 1.6.1)
+ multi_json (~> 1.0.3)
+ dm-timestamps (1.2.0)
+ dm-core (~> 1.2.0)
+ dm-transactions (1.2.0)
+ dm-core (~> 1.2.0)
+ dm-types (1.2.1)
+ bcrypt-ruby (~> 3.0.0)
+ dm-core (~> 1.2.0)
+ fastercsv (~> 1.5.4)
+ json (~> 1.6.1)
+ multi_json (~> 1.0.3)
+ stringex (~> 1.3.0)
+ uuidtools (~> 2.1.2)
+ dm-validations (1.2.0)
+ dm-core (~> 1.2.0)
do_postgres (0.10.8)
data_objects (= 0.10.8)
faraday (0.7.6)
addressable (~> 2.2)
multipart-post (~> 1.1)
rack (~> 1.1)
- geokit (1.6.5)
- multi_json
- multi_json (1.2.0)
+ fastercsv (1.5.4)
+ geokit (1.6.0)
+ json (1.6.6)
+ json_pure (1.6.6)
+ multi_json (1.0.4)
multipart-post (1.1.5)
nokogiri (1.5.2)
rack (1.4.1)
@@ -31,16 +70,19 @@ GEM
rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)
tilt (~> 1.3, >= 1.3.3)
+ stringex (1.3.2)
tilt (1.3.3)
tzinfo (0.3.33)
+ uuidtools (2.1.2)
PLATFORMS
ruby
DEPENDENCIES
+ data_mapper
dm-postgres-adapter
faraday
- geokit
+ geokit (< 1.6.5)
nokogiri
rdiscount
sinatra

0 comments on commit a5ed98f

Please sign in to comment.